Re: [Paparazzi-devel] Git messed up?

[Christophe De Wagter]

if you rebase a branch in which you often pulled master, it is normal that you get LOADS of merge conflicts, because your branch already has the same information as master (you pulled) but each commit in your branch that is in master has a different hash (not same parent-child since your commits are in between and might change the meaning of the commit) ... 

-Christophe 

On Sun, Dec 15, 2013 at 7:01 PM, Ben Laurie <address@hidden> wrote:

I just tried to rebase my git branch onto master, and I get _loads_ of
merge conflicts for files I've never even looked at, let alone
changed.

Did master get rebased and pushed to github or something?

Because that shouldn't normally happen, should it?

_______________________________________________
Paparazzi-devel mailing list
address@hidden
https://lists.nongnu.org/mailman/listinfo/paparazzi-devel