Git branch is not working as I am expecting

后端 未结 2 905
不思量自难忘°
不思量自难忘° 2021-01-22 21:11

Okay so I am new to using git..and I thought I understood the concept of branching, but now I am confused.

Lets say I have a master.

I create a branch called bra

相关标签:
2条回答
  • 2021-01-22 21:32

    Although you were in branch1 when you made the changes, those changes are not really "in" branch1 until you commit them.

    From $ git help checkout:

    Local modifications to the files in the working tree are kept, so that they can be committed to the <branch>.

    If, on the other hand, you commit your changes to branch1 before switching back to master, then when you $ git checkout master, git will revert the files in your working directory back to the snapshot that master points to, as you are expecting.

    If for some reason you really want to avoid committing your changes to branch1, but still work on a different branch without those changes, you might consider using $ git stash to stash your changes, then switch to your new branch and do the work you need to, then switch back to branch1 and do $ git stash pop to get back your stashed changes.

    0 讨论(0)
  • 2021-01-22 21:40

    Since I didn't commit my changes on branch1, I am expecting my branch2 will not have branch1 codes

    Working copy (staged + unstaged changes) is the same for all branches. And what you see is not the branch1 changes, but the working copy changes.

    Once you commit your changes in branch1, you'll no longer see them in branch2 or any other branch.

    0 讨论(0)
提交回复
热议问题