Am 11.12.2012 08:29, schrieb Yves Blusseau: > > Le 10 déc. 2012 à 11:28, Erich Titl<erich.t...@think.ch> a écrit : > >> Hi Yves >> >> on 10.12.2012 10:30, Yves Blusseau wrote: >>> Hi all, >>> >>> i have repush the patch from Erich because it's add a merge commit. >>> Please try to rebase your local topic branch from the remote one before >>> doing the merge. >>> To be sure use the git merge --ff-only command. >> >> I am sure you are right, just what exactly are you saying? Are you >> implying that merge does not work? > > Hi Erich, > merge works, but it's hard to follow what a merge has changed, and so it's > much harder to maintain clean history. >> >> My merge went fine here and a push went fine too (after an additional >> pull :-() so where is the problem? > > In you case, the merge commit is unnecessary because no conflict occured. So > to maintain a clean history it's better to have only fast-forward commits.
Yes, but I made the original change in a forked off local branch, committed there and merged into local maint branch, which I then pushed. So for style reasons instead of merging we should locally rebase? cheers Erich > > Regards, > Yves > ------------------------------------------------------------------------------ LogMeIn Rescue: Anywhere, Anytime Remote support for IT. Free Trial Remotely access PCs and mobile devices and provide instant support Improve your efficiency, and focus on delivering more value-add services Discover what IT Professionals Know. Rescue delivers http://p.sf.net/sfu/logmein_12329d2d _______________________________________________ leaf-devel mailing list leaf-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/leaf-devel
