Re: [Flightgear-devel] GIT strangeness

2011-03-20 Thread Heiko Schulz
Hello Luuk, First I have to say Thanks for answering! When you use git rebase, it tries to replay your local commits on top of the new commits in the master branch.  If you have multiple commits to the same files locally that have also been committed upstream, you will be trying to replay

Re: [Flightgear-devel] GIT strangeness

2011-03-17 Thread Luuk Paulussen
When you use git rebase, it tries to replay your local commits on top of the new commits in the master branch. If you have multiple commits to the same files locally that have also been committed upstream, you will be trying to replay old changes on top of new ones. A better solution when you

[Flightgear-devel] GIT strangeness

2011-03-02 Thread Heiko Schulz
Hi, Working on my projects I usually commit my changes to my local branch several time the week. And to be update, I pull to master and rebase from master to my local branch. Like that: git checkout master # switch to master branch git pull # update it git