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
