Github Workflow Guides
You will be spending the majority of your time at NSS working as a team to solve hard problems together. Git and Github are the tools your team will use to work asynchronously and collaborate.
🧨 You are expected to experiment with, explore, and fail with your code throughout this experience. Conversely, you should never “wing it” with git and Github. Follow the guides here to the letter, and immediately ask for help if you are stuck.
Getting started with a team
Establishing Standards
- Decide on a branch naming convention that everyone must follow.
Branch Processes
- Clone existing repository that is provided by the instructors.
- Starting a new project from scratch with no existing repository.
- Creating a project board to hold issue tickets.
- Create issue tickets that define discrete units of work for the team.
Pull requests
- You are ready for your teammates to review your code.
- You want to review someone else’s code.
- You have updated code in your branch after creating your pull request.
- Your code has been reviewed and approved.
Working with branches
- Update your branch after PR is merged.
- Create a branch when you’re starting new work.
- Delete a branch when it has been merged into
develop.
Merge conflicts
If there are any conflicts when you try to merge a branch, watch the EXTREMELY helpful guide to merge conflicts video to fix the conflict in Visual Studio Code merge editor.