Misc github

Jump to bottom Edit New page

Claudio Rodriguez edited this page May 6, 2013 · 1 revision

haciendo push en un branch

updates were rejected because the tip of your current branch is behind its remote counterpart:

git fetch origin master
git fetch origin elbranch
git pull --rebase origin elbranch

CONFLICTO :

CONFLICT (content): Merge conflict in testrebaseconflict.txt

editar testrebaseconflict.txt y resolver el conflicto
git add testrebaseconflict.txt
git rebase --continue

this pull request cannot be merged automatically (en github) (pero la queremos mergear)

git fetch origin
git checkout -b elbranch origin/elbranch
git pull (sin cambios ni commit)
git merge master
- CONFLICTO
  - editar el archivo, resolver conflicto
  - git add archivo
  - git commit
  - git push origin elbranch
git checkout master
git merge elbranch
git push origin master
si todo salió bien, el pull request en github se cerró solo y aparece mergeado, borrar el branch desde github