Git commands

git_commands.md

Merge Branches

git checkout development
git pull 
git checkout master
git pull
git merge --no-ff --no-commit development

If conflict is encountered, we can run git status to check details about the conflicts and try to solve

git status

Once we solve the conflicts, or if there is no conflict, we commit and push them

git commit -m 'merge development branch'
git push