Re: Question on merge order

On Sat, Nov 02, 2013 at 03:11:55AM +0200, Gerasimos Dimitriadis wrote: > Hi, > > I have a question on the order with which commits are applied on a merge. > > I am merging two branches that have changes on the same text file and > I'd like to ask you about the merge result. > > The following out

Question on merge order

Hi, I have a question on the order with which commits are applied on a merge. I am merging two branches that have changes on the same text file and I'd like to ask you about the merge result. The following output is provided on the two branches to be merged, by the command: git show-branch --dat