Quel est le meilleur (et le plus sûr) moyen de fusionner une branche Git en maître

95

git checkout master git pull origin master git merge test git push origin master 

81

git checkout master git pull origin master git merge test git push origin master 

git checkout test git pull  git checkout master git pull git merge --no-ff --no-commit test 

git status 

git commit -m 'merge test branch' git push 

git checkout master git pull git checkout test git pull git rebase -i master git checkout master git merge test 

git checkout master git rebase -i test 

70

git checkout master git pull git checkout test git log master.. # if you're curious git merge origin/test # to update your local test from the fetch in the pull earlier 

git checkout master git log ..test # if you're curious git merge test git push 

67

git checkout master git pull origin master git merge --squash test git commit git push origin master 

$ git checkout master $ git pull origin master 

$ git merge-base mybranch master c193ea5e11f5699ae1f58b5b7029d1097395196f  $ git checkout mybranch $ git rebase -i c193ea5e11f5699ae1f58b5b7029d1097395196f 

pick 00f1e76 Add first draft of the Pflichtenheft s d1c84b6 Update to two class problem s 7486cd8 Explain steps better 

$ git branch -d mybranch 

$ git push origin :mybranch 

54

git checkout master git pull --rebase origin master git checkout <branch_name> git pull --rebase origin <branch_name> 

git checkout <branch_name> git rebase master 

git add . git rebase --continue 

git rebase --abort 

git push origin <branch_name> 

git push origin -f <branch_name> 

git checkout master git merge --no-ff <branch_name> git push origin master