Hi, On Mon, 20 Apr 2009, Adrian Schröter wrote:
So it might become an option in future to do the different merge order as Andreas has described. Practically it means the submitter has to adapt the changes made by other people to get his stuff working again. We will see if this works better or not.
That's confused. The three-way merge helps the submitter to adapt his own changes faster and easier to the changes coming from the link target packages.
This is not about refusing a three-way merge, this will happen with "osc merge" also using the diff3 tool.
I know that you think that this will happen, you keep saying that (that mls will implement something magic that resembler a diff3). The problem is: It can't be done without remembering the common ancestor. That's what this whole bruhaha is about.
What we discussed here was in the end the order how the changes get applied.
No... Sigh, it's hopeless. You don't listen but keep mixing things, I just hope mls got it. Ciao, Michael.