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 [email protected] https://lists.sourceforge.net/lists/listinfo/flightgear-devel
