From mboxrd@z Thu Jan  1 00:00:00 1970
From: Noorul Islam <noorul@noorul.com>
Subject: Git pull has merge conflict
Date: Sat, 30 Oct 2010 09:29:03 +0530
Message-ID: <AANLkTi=DV6F8XcuJ9GKr=H1H05e=cjUxvx02gMav=bT0@mail.gmail.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Return-path: <emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org>
Received: from [140.186.70.92] (port=46123 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1PC2ax-0000jd-9V
	for emacs-orgmode@gnu.org; Fri, 29 Oct 2010 23:59:08 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <noorul@noorul.com>) id 1PC2av-0002KH-Fk
	for emacs-orgmode@gnu.org; Fri, 29 Oct 2010 23:59:07 -0400
Received: from mail-gx0-f169.google.com ([209.85.161.169]:49193)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <noorul@noorul.com>) id 1PC2av-0002KD-BI
	for emacs-orgmode@gnu.org; Fri, 29 Oct 2010 23:59:05 -0400
Received: by gxk2 with SMTP id 2so1070414gxk.0
	for <emacs-orgmode@gnu.org>; Fri, 29 Oct 2010 20:59:04 -0700 (PDT)
List-Id: "General discussions about Org-mode." <emacs-orgmode.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/emacs-orgmode>,
	<mailto:emacs-orgmode-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/emacs-orgmode>
List-Post: <mailto:emacs-orgmode@gnu.org>
List-Help: <mailto:emacs-orgmode-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/emacs-orgmode>,
	<mailto:emacs-orgmode-request@gnu.org?subject=subscribe>
Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org
Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org
To: emacs-org list <emacs-orgmode@gnu.org>

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