Working with others using git and Github
0 likes363 views
This document provides guidance on using Git for collaborative coding projects. It discusses branching and merging workflows, including creating feature branches, pulling before pushing to avoid conflicts, and merging branches through pull requests. It also covers resolving merge conflicts and using rebase with care. Good Git practices like writing descriptive commit messages and using GitHub issues are also recommended.
Working with others using git and Github
- 1. Round 3 - Jacob Jenkins Working with others™ A guide to branching, merging, and rebasing.
- 2. Code of Conduct - Branch when creating a new feature. - Keep origin/master working. - Pull before you push. - Rebase with caution.
- 3. Branching So, you have a super cool feature you want to add to your group’s project...
- 4. git checkout -b super-cool-feature Now start coding!
- 5. Branch Road Rules - Give the branch a meaningful name. - It’s alright for more than one person to work on a branch. - Make sure to pull origin/master before merging back. How do we merge our feature back into origin/master?
- 6. Two options... 1. Merge it manually! $ git checkout master $ git merge super-cool-branch 2. If you’re using GitHub, submit a pull request! Create Pull Request
- 10. Pull requests are also great for contributing to open source projects.
- 11. The magic of pulling before pushing. git pull does a git fetch and a git merge. What does that mean... It means changes are applied before you commit, minimizing merge conflicts.
- 12. Merge Conflicts - What’s a merge conflict? - How do I solve it? function superCoolFunction() { <<<<<<< HEAD console.log(“Wow, this function is cool”); ======= console.log(“Wow, this function is awful”); >>>>>>> negative-attitude In most cases, you can solve it with your editor.
- 13. function superCoolFunction() { console.log(“Wow, this function is cool”); } $ git add supercool.js $ git commit -m “Make console message positive” $ git push Sometimes, it’s not that easy…
- 14. Rebasing Rebasing allows you to rewind the commits in one branch, pull another, and replay them. This is really useful if you made some changes in a branch and want to avoid having to do a merge for tiny changes. git rebase origin/master It also has an interactive mode that lets you do a bunch of cool things. However, YOU MUST USE REBASE WITH CARE.
- 15. Rebasing Rebasing essentially lets you rewrite history, and with great power comes great responsibility. Thanks Uncle Ben.
- 16. Being a good git citizen
- 17. Write great commit messages - Be descriptive. - Use the imperative mood in the subject. (e.g Add feature, Fix bug) - Keep the subject line to 50 characters. - Capitalize the first letter of the subject and leave off the period. - Line wrap the message body (extra details) at 72 characters.
- 18. Like this, but better
- 19. Use GitHub issues - If you find a problem, submit an issue on GitHub. - Use GitHub issues as a sort of todo list.
- 20. Issues overview Currently open issues
- 21. Issues overview Creating a new issue
- 22. For further reading go here! Fin.