Git：合并2变格后，应用于两个对象的隐藏更改

Question

Is that normal?

Let me explain a bit more.. I have 2 branches, say BranchA and BranchB. I want to merge these 2 branches but i have some changes in BranchA that I want to keep away and revisit, so I stash these files. Then I merge A with B (fix conflicts, commit push etc)

Then I checkout BranchA again and Stash pop.

The result is that now I see these changes as uncommitted changes in both branches!! Is that to be expected??

Answer 1

You don't need to use stash, this is what the stage (index) for. Choose which files or part of files (hunks) to add to the stage and commit them.

hunks are part of files that you want to add. for example if you have 5 changes to file you can choose to add 0-5 changes (to pick few of them and not all of them).

The file system + staging are are Shared between all your branches unless you use git-new-workdir