Difference between revisions of "Ungit"

From Athenaeum
Jump to: navigation, search
(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...")
 
(Squash Merge)
Line 1: Line 1:
=Squash Merge=
+
=Create Branch=
 
# switch to master branch
 
# switch to master branch
 
# press the plus to create a new branch
 
# press the plus to create a new branch
 
# check out that branch, make changes, and commit to that branch
 
# check out that branch, make changes, and commit to that branch
 +
 +
=Squash Merge=
 
# prepare to merge by checking out master branch
 
# prepare to merge by checking out master branch
 
# click/select branch name "master" and then click squash on the branch you've been working on
 
# click/select branch name "master" and then click squash on the branch you've been working on
 +
# all the changed files should show up. enter a new commit message that will be added to the master branch history
  
 
=Rebase on Master=
 
=Rebase on Master=
 
# make sure the branch you've been working on is checked out
 
# make sure the branch you've been working on is checked out
 
# click the name of the branch you've been working on and then click rebase next to master branch
 
# click the name of the branch you've been working on and then click rebase next to master branch

Revision as of 17:15, 24 March 2019

Create Branch

  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

Squash Merge

  1. prepare to merge by checking out master branch
  2. click/select branch name "master" and then click squash on the branch you've been working on
  3. all the changed files should show up. enter a new commit message that will be added to the master branch history

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