我在GitHub存储库中有两个分支，分别是master和development。如下所示，我在development分支中进行所有开发工作。
git branch development
git add *
git commit -m "My initial commit message"
git push -u origin development
现在我想将development分支上的所有更改合并到master分支上。我的当前方法是：
git checkout master
git merge development
git push -u origin master
1）在开发分支上，使用以下命令检查git状态：
git status
不应存在未提交的代码。如果有，请将您的代码推送到开发分支：
git add *
git commit -m "My initial commit message"
git push origin Development
2) 在开发分支上运行以下两个命令：
git branch -f master HEAD
git push -f origin master
git add .
git commit -m "first commit"
git push origin dev
git merge master
git checkout master
git merge dev
git push origin master
git checkout master
git remote update
git merge origin/Develop -X theirs
git commit -m commit -m "New release"
git push --recurse-submodules=check --progress "origin" refs/heads/Master
git checkout master
git merge --no-ff development
git commit --amend
git push origin HEAD:refs/for/refs/heads/master
! [remote rejected] HEAD -> refs/for/refs/heads/master (you are not allowed to upload merges)
https://github.com/ReviewAssistant/reviewassistant/wiki/Merging-branches-in-Gerrit
1. //push the latest changes of current development branch if any
git push (current development branch)
2. //switch to master branch
git checkout master
3. //pull all the changes if any from (current development branch)
git pull origin (current development branch)
4. //Now merge development into master
git merge development
5. //push the master branch
git push origin master
Error
To https://github.com/rajputankit22/todos-posts.git
! [rejected] master -> master (fetch first)
error: failed to push some refs to 'https://github.com/rajputankit22/todos-posts.git'
hint: Updates were rejected because the remote contains work that you do
hint: not have locally. This is usually caused by another repository pushing
hint: to the same ref. You may want to first integrate the remote changes
hint: (e.g., 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.
Then Use
5. //push the master branch forcefully
git push -f origin master
pull操作。此外，与现有答案相比，不清楚这个答案添加了什么价值。 - Kyle Strand
git pull -u用于为分支设置上游追踪（如果推送多个分支，则为所有分支设置）。一旦设置了追踪，它将持久存在。没有必要反复使用它。 - David Culp