Gitcheat

git.md

• What do I do after merging a branch ? What does my team need to do ?

• I created a new branch but I forgot to pull master before Commit all your changes (git add ., git commit) Go back to master git checkout master Update master git pull origin master Go back to your branch git checkout my-branch Take all the changes from master and add them to my branch git merge master Fix conflics & Commit if needed

• I have conflicts how do I solve them git status If something is red (unmerged) open the file fix the conflicts Then git add and git commit (then you can push or continue working as u were)