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 have committed upstream is probably to do a merge rather than a rebase.
e.g git checkout master # switch to master branch git pull # update it git checkout master.local # switch back to the individual branch git merge master # update it which would leave your repository looking something like this: * Merge branch 'master' into master.local (master.local points to here) |\ | * local commit 5 | * local commit 4 | * local commit 3 | * local commit 2 | * local commit 1 * | commit 10 (master points to here) * | commit 9 * | commit 8 * | commit 7 * | commit 6 |/ * commit 5 * commit 4 * commit 3 * commit 2 * commit 1 On Thu, Mar 3, 2011 at 7:00 AM, Heiko Schulz <aeitsch...@yahoo.de> wrote: > 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 checkout master.local # switch back to the individual branch > git rebase master # update it > > That has been working all the time without any problem. > > Now I noticed a strange thing: > At the weekend Gijs had commited my latest changes on the Ec130. > > After that I did the same procedure like always. But with that I got now > several merging conflicts messages, even regarding older commits to the ec130. > > That's something I wonder: only my changes to the ec130 are affected, all > others not. > > What can be the cause, and how to prevent it? > > Thanks > Heiko > > > > ------------------------------------------------------------------------------ > Free Software Download: Index, Search & Analyze Logs and other IT data in > Real-Time with Splunk. Collect, index and harness all the fast moving IT data > generated by your applications, servers and devices whether physical, virtual > or in the cloud. Deliver compliance at lower cost and gain new business > insights. http://p.sf.net/sfu/splunk-dev2dev > _______________________________________________ > Flightgear-devel mailing list > Flightgear-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/flightgear-devel > ------------------------------------------------------------------------------ Colocation vs. Managed Hosting A question and answer guide to determining the best fit for your organization - today and in the future. http://p.sf.net/sfu/internap-sfd2d _______________________________________________ Flightgear-devel mailing list Flightgear-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/flightgear-devel
