[orion-dev] PLEASE READ: fix master in org.eclipse.orion.client repo

[Paul Webster <pwebster@xxxxxxxxxxxxxxxxxxx>]

If you've pulled from org.eclipse.orion.client over the last day, your master might not be in a good state (especially if it lists something like: Your branch and 'origin/master' have diverged,and have 3 and 1 different commit each, respectively.)

To get up to the current "correct" version of master, assuming your git repo doesn't have staged or unstaged  changes:

git branch tmpMaster HEAD
git fetch
git reset --hard origin/master

git log tmpMaster will point to your old master, and you can cherry-pick commits across or rebase them/merge then into master and push them

--

Paul Webster
Hi floor.  Make me a sammich! - GIR