Skip to content

Instantly share code, notes, and snippets.

@edunham

edunham/solution.sh

Last active February 14, 2018 20:07
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save edunham/fbd489bdf22d871370ccbf1592dc8e26 to your computer and use it in GitHub Desktop.
Save edunham/fbd489bdf22d871370ccbf1592dc8e26 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
solution.sh
git checkout -b working # Create new branch named working. We don't care where from. Doesn't really matter what it's called.
git fetch upstream devel # get the latest commits on ansible/devel available
git reset --hard upstream/devel # force current branch to be exactly the commits on ansible/devel
git cherry-pick b4b5d2b93ee94b0e28308739a1f1f79552786a22 # apply just that one commit
# fix the merge conflicts
# now branch 'working' has what branch 'devel' *should* have had all along
git branch -D devel # delete the local branch named devel, since you have the changes on branch 'working' now. This does not change what's on your GitHub.
git checkout -b devel # make a new local branch named devel from where we were at, which was correct state for devel
git push --force origin devel # force push the contents of current devel branch to overwrite the devel branch on your github.
# in prior command, 'kbreit' is the remote name for your fork as shown in the repo's .git/config
# then when you refresh the PR it should all be right
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment