Git: How to finish a PR for someone who is away on vacation

How to get a copy of someone else’s pull request from Rolfe Dlugy-Hegwer on Vimeo. Suppose you work with someone who is away for the Thanksgiving or Christmas holidays. What if you need to make changes to their pull request and get them merged before they return? Prerequisites You and your colleague both have forks…More

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’s…More

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 this…More