[
Date Prev][
Date Next][
Thread Prev][
Thread Next][
Date Index][
Thread Index]
[
List Home]
|
Re: [orion-dev] PLEASE READ: fix master in org.eclipse.orion.client repo
|
Should explain in Orion terms as well? What’s a command line ;-)
> On Apr 15, 2015, at 1:37 PM, Paul Webster <pwebster@xxxxxxxxxxxxxxxxxxx> wrote:
>
> 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
> _______________________________________________
> orion-dev mailing list
> orion-dev@xxxxxxxxxxx
> To change your delivery options, retrieve your password, or unsubscribe from this list, visit
> https://dev.eclipse.org/mailman/listinfo/orion-dev
