Skip to content

Latest commit

 

History

History
105 lines (79 loc) · 2.25 KB

Lesson4.md

File metadata and controls

105 lines (79 loc) · 2.25 KB

Lesson 4 - Oh G*T - I'm on the wrong branch

New Terms

  • Stash - saves your changed files off to a temporary shelf.
    • Stash Pop - get those changes back and apply on top of current branch.

Prerequisites

  • Make sure your repo is in sync - Lesson 2
  • Admin merge in PR to upstream - so that repo is ahead

Lesson

Stage 1 - Make a change in the wrong branch!

  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. If you're not still on the addFriends branch, check it out

    git checkout addFriends

  4. Make a change

    notepad .\README.md

  5. Check status to see where you are

    git status

    On branch addFriends
Your branch is up to date with 'origin/addFriends'.

Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
(use "git restore <file>..." to discard changes in working directory)
        modified:   README.md

no changes added to commit (use "git add" and/or "git commit -a")

  6. Oh no - I'm still on the old branch - addFriends. Checkout master so we can create a new branch

    git checkout master

    PS C:\GitHub\GitDemo> git checkout master
error: Your local changes to the following files would be overwritten by checkout:
README.md
Please commit your changes or stash them before you switch branches.
Aborting

    That didn't work as the checkout would overwrite my changes.

Stage 2 - Stash changes so you can switch branches

  1. Stash the changes

    git stash

  2. Now checkout master

    git checkout master

  3. Update master from upstream

    git pull upstream master

  4. Update your fork on Github (origin).

    git push

  5. Create a branch for your new work

    git checkout -b newIdea

  6. Un-stash your changes

    git stash pop

  7. Now you've made your changes against the most up to date copy of the master branch.

  8. Add, Commit and Push.

Next Up...