Git rid of old branches :-)

Every so often, I clean up old working branches I don’t need any more. After I’ve written or revised content, and the pull request has been merged from my fork of the repo into the main branch of the organization’s repo, it’s time to get rid of the old working branches. TLDR/Copy and paste Here’sContinue reading “Git rid of old branches :-)”

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”