benjamin.vanryseghem.pharo at gmail.com
Sun Nov 24 20:09:33 EST 2013
I would have been more efficient to wait till a new slice is proposed.
If you want to focus on you project instead of loosing time resolving conflicts about thing you do not have knowledge about
I think a good way to save time is to let people knowing resolving merge conflict, aka the guy who proposed a fix.
Otherwise, you (and any integrator) will have to know everything about the whole system,
and this will never happen.
The monkey is here to show the contributors that what they propose is not working properly.
Loading slices with conflicts can only lead to reverting code.
And doing the same things again and again when you think it is in the system is far worse that proposing
a new version up to date of a slice, since usually the feedback provided by the infrastructure takes a couple of minute
while chasing accidentally rollback fixes may take much longer.
On 24 Nov 2013, at 22:02, Stéphane Ducasse <stephane.ducasse at inria.fr> wrote:
>>>> I would like, but I have not found out how. I will take care of it and ask in mailing list.
>>>> Anyway, I am not sure if it was well integrated.
>>> There was a conflict and I fully loaded your code. So I do not see how it could be different.
>>> But with computer science everything is possible.
>> Why loading it if there was a conflict ?
> Do you really think that as an integrator we never chose which method to integrate and that we never handle conflicts?
> The version I selected is correct and working this is just an unused variable.
> Now if you want I can also stop looking at any bug entry and stop to integrate fix and focus on my own project.
> You will see if will take more time to get things integrated and do not believe that automatically validated means something
> when we are talking about certain aspects of the system.
> No need to rant that nobody take cares of integrating bugs.
> Living is taking action.
-------------- next part --------------
An HTML attachment was scrubbed...
More information about the Pharo-dev