Cf. discussion in #138.
For reference, here's how you can integrate someone else's changes from a fork:
1. Add the remote
I usually name them from the github username of the person with the fork:
2. Fetch the new commits
The easy way:
Then you can see in your branch list that you've got
Or, you can be more precise:
3. Cherry-pick or merge
If you're only interested in a commit or two, you can cherry-pick them
Would give you a list of all commits with authors, dates, messages, and most importantly commit hashes (SHA1).
Then you can run cherry-pick with any commit hash, and this will attempt to apply it to your current HEAD:
If you're happy with the state of a distant branch and just want to merge it all, you can check out the changes to a local branch, then switch back to your working branch, and merge it all:
Some people prefer to use
Or, since I made a pull request for that one, you can just click "Merge" on the GitHub UI and hopefully everything will go smoothly :)
The text was updated successfully, but these errors were encountered: