Page Comparison

Overview

Everyone develops of master.

Regular commits are essential.

Simulation Setup

You will need two git accounts. A root account and then all others get invited into to the repo.

1. One team member (root user) creates a remote git repo (the root account)

2. Invite the other team member into this root account. Once they accept, the root repo will appear in their account

3. Someone in the team must set the project up, they push this to the root repo

4. Other team members clone the project. Once cloned they can begin to work on their part of the project

5. Root user creates assets and pushes them to master

6. Team member 2 creates some assets and attempts to push them to master

7. A git conflict occurs

   Image Added

8. User git pull --rebase origin master

   1. git pull is like using svn update

   2. --rebase option tells Git to move all of Mary’s commits to the tip of the master branch after synchronising it with the changes from the central repository. The pull would still work if you forgot this option, but you would wind up with a superfluous “merge commit” every time someone needed to synchronize with the central repository. For this workflow, it’s always better to rebase instead of generating a merge commit.