Git - Task7
Everyday tasks with Git
- Git merge
git pull shukra
git fetch shukra then git merge shukra
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