Git Teamwork
An introduction to Git collaborations with remotes, pulling and pushing
StartKey Concepts
Review core concepts you need to learn to master this subject
Git Collaboration Workflow
List the Git Remotes
Pushing Branch Changes
Cloning a Remote Repository
Fetching Remote Origin Changes
Git Remote
Merging Fetched Changes
Git Collaboration Workflow
Git Collaboration Workflow
A common Git collaboration workflow is:
- Fetch and merge changes from the remote
- Create a branch to work on a new project feature
- Develop the feature on a branch and commit the work
- Fetch and merge from the remote again (in case new commits were made)
- Push branch up to the remote for review
Steps 1 and 4 are a safeguard against merge conflicts, which occur when two branches contain file changes that cannot be merged with the git merge command.
Git Teamwork
Lesson 1 of 1
- 3Nice work! We have a clone of Sally’s remote on our computer. One thing that Git does behind the scenes when you clone science-quizzes is give the remote address the name origin, so that you …
- 6Now that you’ve merged origin/master into your local master branch, you’re ready to contribute some work of your own. The workflow for Git collaborations typically follows this order: 1. Fetch and…
- 8Congratulations, you now know enough to start collaborating on Git projects! Let’s review. * A remote is a Git repository that lives outside your Git project folder. Remotes can live on the w…
What you'll create
Portfolio projects that showcase your new skills
How you'll master it
Stress-test your knowledge with quizzes that help commit syntax to memory