我错误地在主分支上工作,
我如何将更改从master转移到我的分支?
谢谢。
最佳答案
您可以从存储库的根目录运行以下命令
git reset HEAD -- . #this will unstage all the files
git stash #this will stash all the changes
git checkout <your_branch> #this will switch the branch
git stash pop #this will apply all the stashed changes in <your_branch>.
#If there are conflicts at this point, resolve them, then do the following
git add -all
git commit -am "<your_commit_message>" #this will commit in new branch.
注意:#
后面的语句是注释。它不属于命令,执行命令时应将其排除。
关于git - 如何将更改从 master merge 到 git 中的我的分支,我们在Stack Overflow上找到一个类似的问题: https://stackoverflow.com/questions/55156080/