Job aid: Git cherry-pick a commit and manually resolve a conflict

This post is short version of Git: Cherry-pick a commit into a branch and resolve a merge conflict. Replace `upstream/enterprise-4.8` with whatever your target branch is. I copy/paste these commands into my terminal. Verify that “Your branch is up to date with ‘upstream/enterprise-4.8’.” Go to the pull request that has the merge failure (e.g., like thisContinue reading “Job aid: Git cherry-pick a commit and manually resolve a conflict”

Git: Cherry-pick a commit into a branch and resolve a merge conflict

Here’s the merge conflict message our merge master got when she tried to cherry pick my pull request (PR) to version 4.7 of the published OpenShift docs (lines , below). Here, I start by deleting the enterprise-4.7 branch (line ) because it had a previous unmerged commit sitting at the top of the pile. (InContinue reading “Git: Cherry-pick a commit into a branch and resolve a merge conflict”