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

[Kevin Kofler]

Toshio Kuratomi wrote:
> 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
> :-(

I think your problem there was that you cannot use rebase on a branch you 
already pushed, because rebase rewrites the branch's history, and Fedora's 
git hooks ban you from doing that on already pushed branches. (A push which 
rewrites history is not a fast-forward push.)

        Kevin Kofler