On Wed, 11 May 2011, thorsten.i.r...@jyu.fi wrote:
> I then switch to master, do a
>
> git pull
> git checkout local-weather
> git rebase master
>
> Now the trouble starts, because after the final command, the system
> bitches about merging conflicts and asks me to resolve them or use
>
> git rebase --skip
>
> to continue. If I simply continue, then basically all my custom changes
> get erased. Somehow, I'm expected to do something which isn't covered in
> the Wiki. The man page of git rebase talks about a lot of interesting
> things like 'patience', 'subtree' and 'octopus' which just confuses me
> more. I think my time is better spent thinking about atmospheric light
> scattering, cloud interaction with terrain and such things than about
> cephalopods.
Basically, you have to resolve your conflicts at that point if you want
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.
Cheers,
Anders
--
---------------------------------------------------------------------------
Anders Gidenstam
WWW: http://www.gidenstam.org/FlightGear/
------------------------------------------------------------------------------
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
