On Saturday 12 November 2011 08:53:51 Alvaro Soliverez wrote: > Hello Cristian, > Actually, it was you who caused the merge.
Actually I think it was the other way around :) see bellow. > That was probably because of the following scenario: > > you both pulled from master at the same time, then worked on your > modifications on master. > Thomas then pushed before you did. > You tried to push and got an error because there new commits. > Then you pulled without rebase, and that point it merged your local changes > with Thomas' > > If you had pulled with rebase, there wouldn't have been a merge commit. If the merge commit appeared on my side then why is the merge commit's author Thomas in 11.11.2011 10:48 when I pushed my changes to origin/master in 10.11.2011 23:22? > Regards, > Alvaro > > On Sat, Nov 12, 2011 at 7:52 AM, Cristian Oneț <onet.crist...@gmail.com>wrote: > > On Friday 11 November 2011 21:27:25 Alvaro Soliverez wrote: > > > What rebasing means, is that it will get the commits from another > > > branch, and it will try apply your commits on top of that. If there > > > is a> > > conflict, > > > > > you have the opportunity to fix it while rebasing. > > > > I'm trying a more visual approach until I'm familiar with everything, > > does the > > 'red detour' in the attached screenshot means that Thomas did a merge > > instead > > of a rebase before pushing a7dfac98ae? If so that means that if we use > > rebase > > we get a nice linear evolution while with merge we get a lot of > > branching > > in > > the commit tree, is that right? > > > > -- > > Regards, > > > > Cristian Oneț > > _______________________________________________ > > KMyMoney-devel mailing list > > KMyMoney-devel@kde.org > > https://mail.kde.org/mailman/listinfo/kmymoney-devel -- Regards, Cristian Oneț
signature.asc
Description: This is a digitally signed message part.
_______________________________________________ KMyMoney-devel mailing list KMyMoney-devel@kde.org https://mail.kde.org/mailman/listinfo/kmymoney-devel
