Why does git merge have so much trouble with Fedora package?branches?

[Simo Sorce]

On Thu, 2011-11-10 at 13:49 -0800, Toshio Kuratomi wrote:
> On Thu, Nov 10, 2011 at 09:37:38PM +0000, phantomjinx wrote:
> > 
> > 
> > I would recommend rebasing branches against master up until they are pushed, if
> > required to be shared. Doing so retains a linear history on the branch and can
> > mean the branch commits can end up being fast forwarded onto master when the
> > feature is complete.
> > 
> I'm a little leary of rebase... Everytime I've tried to use it in any
> project I've managed to get my checkout in a state where I had to make
> a fresh clone, do a manual diff between my old working tree and new one, and
> then delete the old clone.  I know that other people somehow manage to use
> this successfully I've justnever managed to without disaster striking :-(

Toshio, I generally found this situation to happen when people haven't
yet grokked how branches work in git.

If you want I am available to get on a 1-1 session with to show how to
successfully use rebases, which is the only thing I use.

Simo.

-- 
Simo Sorce * Red Hat, Inc * New York