...
| Info |
|---|
Depending on which team pushed their code to the repo first, the later team will get a merge conflict. Use git pull --rebase origin master Use git status to see where conflicts are Once conflict has been resolved, push the changes to the repo (no need to perform git add, and git commit, simply use git push…) |