git merge & git rebase
bug
error: You have not concluded your merge (MERGE_HEAD exists).
hint: Please, commit your changes before merging.
fatal: Exiting because of unfinished merge.
https://stackoverflow.com/questions/50104525/git-merging-problems-while-pulling/50104672
https://stackoverflow.com/questions/11646107/you-have-not-concluded-your-merge-merge-head-exists
# To undo a merge
$ git merge --abort
# dangerous
$ rm -rf .git/MERGE*
rebase
https://git-scm.com/book/zh/v2/Git-分支-变基
merge
https://git-scm.com/book/zh/v2/Git-分支-分支的新建与合并
https://git-scm.com/book/zh/v2/Git-分支-分支简介
https://git-scm.com/book/zh/v2/Git-工具-高级合并
ignore & discard
https://stackoverflow.com/questions/52704/how-do-i-discard-unstaged-changes-in-git
git merge
# step1: change branch to master, and pull to update all commits
$ git checkout master
$ git pull
# step2: change branch to target, and pull to update commits
$ git checkout feature
$ git pull
# step3: merge master to feature(⚠️ current is feature branch)
$ git merge master
https://stackoverflow.com/a/58814036/5934465
https://nvie.com/posts/a-successful-git-branching-model/
refs
©xgqfrms 2012-2020
www.cnblogs.com 发布文章使用：只允许注册用户才可以访问！