Week 20 - Session 1 - Class Project (Week 1) - Git Branching + Merging

blog image source
Branches are most powerful when you're working on a team. You can work on your own part of a project from your own branch, pull updates, and then merge all your work into the main branch when it's ready.

Working with branches:

  • git branch - to see what branches you have, and to check which one you’re currently on.
  • git branch <branch_name> - to create a new branch off of the current branch.
  • git branch -d <branch_name> - to delete a branch.
  • git checkout <branch_name> - to change onto a branch.
Merging is Git's way of putting a forked history back together again. The git merge command lets you take the independent lines of development created by git branch and integrate them into a single branch.

Git Branch - https://www.atlassian.com/git/tutorials/using-branches
Git Branching - https://git-scm.com/book/en/v2/Git-Branching-Basic-Branching-and-Merging
git - the simple guide - http://rogerdudler.github.io/git-guide/

Popular posts from this blog

Week 9 to 12 - Learning with MCR Codes

Week 8 - Session 1 - JavaScript in the Browser

Week 9 - Session 1 - The Internet, the Web, HTTP