2. git remote add <repo name> git://<url> <br />3. git checkout master, pull to master first to avoid conflict<br />4. git pull <repo name>/master<br />5. git checkout mouselock, change to mouse lock to merge with our up to date master.<br />6. git merge master<br /> <br /><br />To fix a merge conflict<br />1. git status, to see what files have an issue<br />2. git add <file>, fix then add those files<br />