On 11/20/2013 08:55 AM, Petr Bena wrote:
aha I see now, I should have branch before patch1. I didn't. What am I
supposed to do now?
I think:
git checkout production
git checkout -b patch1
(that was just to "back up" patch1, in case you didn't have it anywhere
else)
git checkout production
git reset --hard origin/production
would have done what you want. That would set your production branch to
the last version of production fetched from Gerrit (so not including any
unmerged changes).
Note, --hard erases any uncommitted changes.
Matt Flaschen
_______________________________________________
Wikitech-l mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/wikitech-l
