Hi Guys, just FYI - I got a case that "git rebase" merge the code to the wrong position(but without reporting any error) when the code base changes much. I also tested other related commands based on patch mechanism, such as patch, git apply, git format-patch. all merge the code incorrectly.
but git cherry-pick does merge correctly. looks cherry-pick is stronger than patch based stuff... thanks. On Sat, May 24, 2014 at 3:03 PM, ramkrishna vasudevan < [email protected]> wrote: > +1. > > > On Sat, May 24, 2014 at 3:46 AM, lars hofhansl <[email protected]> wrote: > > > +1 > > > > > > > > ________________________________ > > From: Andrew Purtell <[email protected]> > > To: "[email protected]" <[email protected]> > > Sent: Friday, May 23, 2014 10:38 AM > > Subject: [DISCUSSION] Avoiding merge commits > > > > > > I recommend we do not push merge commits upstream. I suppose it is easy > > enough to filter them out when looking at history but there is no need to > > be merging upstream branches into your local tracking branch when you can > > rebase instead. In this way we can avoid polluting the history in the > > master repository with unnecessary merge commit entries. (And maybe some > > devs will be merging upstream into tracking branches or merging commits > > from local feature branches several times per day, and these will all > > accumulate...) > > > > When updating your local tracking branch from upstream, use git fetch > > upstream && git rebase upstream/branch instead of 'git merge'. > > > > When developing features on a local branch it's possible to do a squash > > commit from the feature branch to the tracking branch using 'git rebase' > > instead of 'git merge', then a push of the single squashed commit from > the > > tracking branch to the upstream branch. > > > > If these workflow choices are acceptable by consensus we can update the > > 'how to commit' document with an illustration of the workflow with > example > > commands. > > > > > > -- > > Best regards, > > > > - Andy > > > > Problems worthy of attack prove their worth by hitting back. - Piet Hein > > (via Tom White) > > >
