Lesson5.md

Lesson 5 - Rebasing your branch

New Terms

• Rebase - Changing the base of your branch

Prerequisites

• Completed through lesson 4
• Admin has merged PR in

Lesson

Stage 1 - Make a change

1. Navigate to your repo if you're not already there

   Set-Location C:\GitHub\GitDemo

2. Check status to see where you are

   git status
   

3. Create a branch to work in

   git checkout -b rebaseWork
   

4. Add a file work.ps1 with the following contents:

   Get-Content .\todo.txt

5. Add, Commit & Push to your fork on GitHub

   git push --set-upstream origin rebaseWork
   
   

6. Check your branch on GitHub

   This branch is 1 commit ahead, 2 commits behind jpomfret:master
   

   This development process took a while, and now it's time to merge in but the upstream codebase has newer changes than you have in your clone.

Stage 2 - Get master branch on your clone up to date

1. Checkout your master branch

   git checkout master
   

2. Pull down the changes to master

   git pull upstream master
   

3. Push changes to your repo on GitHub

   git push
   

Stage 3 - Rebase your branch from the now up to date master

1. Checkout work branch

   git checkout rebaseWork
   

2. Rebase branch from master

   git rebase origin/master
   

   First, rewinding head to replay your work on top of it...
   Fast-forwarded rebaseWork to origin/master.
   

3. Force push your changes to your clone

   git push --force
   

4. Check GitHub

   This branch is even with jpomfret:master
   

Next Up...

• Lesson 6