emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed
* Git pull has merge conflict
@ 2010-10-30  3:59 Noorul Islam
  2010-10-30 13:32 ` Greg Troxel
  0 siblings, 1 reply; 4+ messages in thread
From: Noorul Islam @ 2010-10-30  3:59 UTC (permalink / raw)
  To: emacs-org list

I am not sure why this conflict is arising even after resetting to
head and then doing a pull

$ noorul@sajida:~/emacs/org-mode$ git reset --hard
HEAD is now at ba6b6f3 Merge branch 'master' of git://repo.or.cz/org-mode

$ noorul@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

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2010-10-30 14:01 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-10-30  3:59 Git pull has merge conflict Noorul Islam
2010-10-30 13:32 ` Greg Troxel
2010-10-30 14:00   ` Noorul Islam
2010-10-30 14:01   ` Noorul Islam

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).