Verwenden Sie den Patch-Modus, um Konflikte zu vermeiden. Zum Beispiel:
git pull origin master #pull from master git checkout -p origin/bug1 #patch bug1 branch git checkout -p origin/bug2 #patch bug2 branch git checkout -b myMerge #rename branch git commit -m "Patched diffs from branches bug1 and bug2" git push
Verweise