I am not sure why this conflict is arising even after resetting to head and then doing a pull
$ noo...@sajida:~/emacs/org-mode$ git reset --hard HEAD is now at ba6b6f3 Merge branch 'master' of git://repo.or.cz/org-mode $ noo...@sajida:~/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 _______________________________________________ Emacs-orgmode mailing list Please use `Reply All' to send replies to the list. Emacs-orgmode@gnu.org http://lists.gnu.org/mailman/listinfo/emacs-orgmode
