This is the curriculum for the 2018 Foxtrot Web Developer Bootcamp.

Git Merge Conflicts from LEARN on Vimeo

Merge Conflicts

Terminal (git)

git status
git add .
git commit -m "..."
git push origin name_of_branch

GitHub

create pull request

  • merge conflicts
Terminal (git)

git status => Ensure working branch is clear, if not, commit changes before switching over to master branch.
git checkout master
git pull origin master
git checkout name_of_branch
git merge master

Rails App

resolve conflicts

  • Ensure all conflicts are resolved and identifiers(>>>>>>>> HEAD) are removed before committing changes.
Terminal (git)

git status
git add .
git commit -m "..."
git push origin name_of_branch

GitHub

create pull request

  • Able to automatically merge

merge branch
confirm merge
delete the branch