Actions

EmSys

Git - Task7

From EdWiki

Everyday tasks with Git

  • Git merge
git pull shukra

OR

git fetch shukra then git merge shukra
  • Conflicts
git show :1:file.txt  # the file in a common ancestor of both branches
git show :2:file.txt  # the version from HEAD, but including any
                      # nonconflicting changes from MERGE_HEAD
git show :3:file.txt  # the version from MERGE_HEAD, but including any
                      # nonconflicting changes from HEAD.
  • Resolve the conflicts / reset and ask others to help