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)Let me explain a bi
