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 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. I tried your method always at my beginning of using GIT, but this gaves me often merge errors as well especially on my edited preferences.xml. It might be that my problem the config for the line endings was. I had changed it accidently and didn't noticed it. Though I'm still surprised that it worked a long time so I#m not sure if this was the real cause, so I will keep your proposal in mind. Heiko ------------------------------------------------------------------------------ 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 [email protected] https://lists.sourceforge.net/lists/listinfo/flightgear-devel
