Imagine that you have a conflict because a method changed in the image and that the resolution is please keep the version that was in the slice, then you republish a slice with the same method and when the integrator will do merge he will get again: there is a conflict with the different version that it is the image. So from a person performing a fix there is no way that I can produce a slice that does not produce a conflict.
> I don't understand. If you merge and recommit it is fine, since the new slice > will have different ancestors the 3-way merge won't complain a second time, > no? > > On 2013-06-25, at 11:49, Stéphane Ducasse <[email protected]> wrote: >> Hi guys >> >> I do not know how I can republish a Slice when there is a conflict. >> Especially when I merged and say that I want to keep the change I did. So we >> are in the deadlock. There is no way for the fix producers to indicate that >> he merged and that his changes should be keep. >> >> So from a bug integration process this is not really good. >> >> Stef > >
