Ungit

From Athenaeum
Revision as of 17:11, 24 March 2019 by James8562 (talk | contribs) (Created page with "=Squash Merge= # switch to master branch # press the plus to create a new branch # check out that branch, make changes, and commit to that branch # prepare to merge by checkin...")

(diff) ← Older revision | Latest revision (diff) | Newer revision → (diff)
Jump to: navigation, search

Squash Merge

  1. switch to master branch
  2. press the plus to create a new branch
  3. check out that branch, make changes, and commit to that branch
  4. prepare to merge by checking out master branch
  5. click/select branch name "master" and then click squash on the branch you've been working on

Rebase on Master

  1. make sure the branch you've been working on is checked out
  2. click the name of the branch you've been working on and then click rebase next to master branch