Skip to content

Latest commit

 

History

History
15 lines (10 loc) · 1003 Bytes

19_forgot_to_branch.md

File metadata and controls

15 lines (10 loc) · 1003 Bytes
Raw

Oops, I forgot to create a branch

If you begin working, but you are still on main, don’t panic! Changes aren't “on” a branch until they are committed. Your working directory and staging area are attached to HEAD, not a branch. So, you can change branches, and any changes that are not committed will come with you.

Activity: Create a branch after making changes

  1. Modify file before creating branch
    • Notice that the working directory and staging area are portable - files sitting in each area will remain there when you switch branches!
  2. Type git status, and notice changes in your working directory
  3. Create a new branch with git switch -c BRANCH-NAME
  4. Type git status again, to notice which branch you are on, and your working directory

Non-committed conflicts

What do you think would happen if you made changes to a file, then tried to switch to another branch, but that branch had committed changes that conflict with your new, uncommitted changes? Why?