Skip to content

Instantly share code, notes, and snippets.

@bioid
Last active May 26, 2020 19:04
Show Gist options
  • Save bioid/4ac0780fa4bf8c906f0d70bdc27ce6d4 to your computer and use it in GitHub Desktop.
Save bioid/4ac0780fa4bf8c906f0d70bdc27ce6d4 to your computer and use it in GitHub Desktop.
Make the branch and changes:
1. Create feature branch (git checkout -b feature)
2. Make changes in feature branch
3. Commit and push the changes (git add && git commit && git push origin feature)
Now we make our branch ready to merge:
4. Pull from master into your feature branch (git pull origin master)
5. Resolve merge conflicts
6. Run tests and make sure they're passing (npm run test)
7. Commit and push
Now the branch is ready for a PR
8. Go to the feature branch on GitHub, and click New Pull Request"
9. Fill out the form and submit, your pull request is now Open.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment