[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Orgmode] Git pull has merge conflict
From: |
Noorul Islam |
Subject: |
[Orgmode] Git pull has merge conflict |
Date: |
Sat, 30 Oct 2010 09:29:03 +0530 |
I am not sure why this conflict is arising even after resetting to
head and then doing a pull
$ address@hidden:~/emacs/org-mode$ git reset --hard
HEAD is now at ba6b6f3 Merge branch 'master' of git://repo.or.cz/org-mode
$ address@hidden:~/emacs/org-mode$ git pull
Auto-merging ORGWEBPAGE/index.org
CONFLICT (content): Merge conflict in ORGWEBPAGE/index.org
Automatic merge failed; fix conflicts and then commit the result.
Thanks and Regards
Noorul
- [Orgmode] Git pull has merge conflict,
Noorul Islam <=