git fetch && git rebase
git checkout --no-track -b feature/branch remotes/origin/branch
git apply --reject
git am --3way --ignore-space-change --keep-cr ~/0001.patch (git fech & git rebase 保留自己分支不用git pull)
git clean -fxd && git checkout . git prune git gc --auto(需关SI)
git checkout -b branch
git push origin branch
git push origin :branch //删除远程分支 空格 :branchName
git push --progress "origin" branch (远端 无 自己的commit)
git push --force-with-lease --progress "origin" branch git prune &&
git cherry-pick 1f03c1fd0a0705
git pull --progress --no-rebase -v "origin" master “一次性解决冲突 no-rebase”
git merge --continue