Anders, you're my hero! It actually worked :-) Maybe I should add that to the wiki?
* Thorsten > to keep your commit. Even if you merged your changed branch (e.g. > with git pull) rather than rebasing it you'd get the conflicts. > > git status to check which files are in conflict. > git add <files> to register the state you want them to have. > This may include cleaning out merge conflict from > text files before adding them. > use git checkout local-weather -- the/file > to restore your version and > git checkout master -- the/file > to restore the upstream version. > git rebase --continue to continue the rebase. > > > For your own local work I recommend committing it in small logical units > - > that makes it easier to use git rebase --skip to remove local edits when > they become obsolete due to upstream updates. > > Btw. if you don't have any particular need to checkout the master branch > just > git fetch origin/master > git rebase origin/master > on the local-weather branch will do. > But do remember to use origin/master rather than just master in git diff > and git checkout -- some/file commands in that case, since your local > master branch will not be updated by fetch and rebase. ------------------------------------------------------------------------------ Achieve unprecedented app performance and reliability What every C/C++ and Fortran developer should know. Learn how Intel has extended the reach of its next-generation tools to help boost performance applications - inlcuding clusters. http://p.sf.net/sfu/intel-dev2devmay _______________________________________________ Flightgear-devel mailing list Flightgear-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/flightgear-devel
