Skip to content

Latest commit

 

History

History
18 lines (10 loc) · 621 Bytes

4_merge.md

File metadata and controls

18 lines (10 loc) · 621 Bytes

Branch

Combining the work from the multiple of branches together, this will allow us to branch off, develop a new feature, and then combine it back in.

For example, we have a Master branch and now it's on stage C then we create a feature branch based current stage C(a snapshot derived from A) and later we developed D and E as we continued working on this feature branch.

Upstream vs Origin

when we git merge will combine a sequences of commits into one unified history.

Usage

merge a branch

  • git checkout master
  • git merge branch-name