Noorul Islam <noo...@noorul.com> writes: > 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.
Because you reset to master, which is your copy, rather than resetting to origin/master, which would discard local changes.
pgpqYlQ5YlXgx.pgp
Description: PGP signature
_______________________________________________ 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
