by AndersG » Sun Apr 28, 2013 7:48 pm
Don't remove anything! If you have a local clone of fgdata you have everything at hand - starting over is just creating a new local branch that tracks master, e.g.:
git branch my-new-master origin/master
git checkout my-new-master
And update it to latest with (I recommend using --rebase in the future since that will keep your local commits after all up stream commits):
git pull --rebase
Use
git status
and
git diff
to investigate what ever uncommitted changes you may have in your tree.
If you want to throw all such changes away, use
git reset --hard
Or you can use
git stash
to save them for later.
If you have an old branch with your work and want to reapply selected commits to the new one, git cherry-pick is a useful command.
/Anders
Callsign: SE-AG
Aircraft (uhm...)
: Submarine Scout, Zeppelin NT, ZF Navy free balloon,
Nordstern,
Hindenburg, Short Empire flying-boat, ZNP-K, North Sea class, MTB T21 class, U.S.S.
Monitor, MFI-9B, Type UB I submarine,
Gokstad ship, Renault FT.