如何在git中将更改从master合并到我的分支

Question

我错误地在master分支上工作，
如何将我的更改从master移到我的分支？
谢谢。

Answer 1

您可以从存储库的根目录运行以下命令

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.

---

注意：#之后的语句是注释。它不属于命令，在执行命令时应排除在外。