From mboxrd@z Thu Jan  1 00:00:00 1970
From: Noorul Islam <noorul@noorul.com>
Subject: Re: Git pull has merge conflict
Date: Sat, 30 Oct 2010 19:30:57 +0530
Message-ID: <AANLkTimSQaBMYo0SgtAgS7_UsPBzzx0ogoBMeZNLMuP8@mail.gmail.com>
References: <AANLkTi=DV6F8XcuJ9GKr=H1H05e=cjUxvx02gMav=bT0@mail.gmail.com>
	<rmiy69fn6vz.fsf@fnord.ir.bbn.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=40649 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1PCBzR-00027U-T7
	for emacs-orgmode@gnu.org; Sat, 30 Oct 2010 10:01:03 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <noorul@noorul.com>) id 1PCBzQ-0006Tq-7K
	for emacs-orgmode@gnu.org; Sat, 30 Oct 2010 10:01:01 -0400
Received: from mail-yw0-f41.google.com ([209.85.213.41]:37635)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <noorul@noorul.com>) id 1PCBzQ-0006Tg-4y
	for emacs-orgmode@gnu.org; Sat, 30 Oct 2010 10:01:00 -0400
Received: by ywl5 with SMTP id 5so2307842ywl.0
	for <emacs-orgmode@gnu.org>; Sat, 30 Oct 2010 07:00:59 -0700 (PDT)
In-Reply-To: <rmiy69fn6vz.fsf@fnord.ir.bbn.com>
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: Greg Troxel <gdt@ir.bbn.com>
Cc: emacs-org list <emacs-orgmode@gnu.org>

On Sat, Oct 30, 2010 at 7:02 PM, Greg Troxel <gdt@ir.bbn.com> wrote:
>
> Noorul Islam <noorul@noorul.com> writes:
>
>> 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.
>
> Because you reset to master, which is your copy, rather than resetting
> to origin/master, which would discard local changes.
>

Thank you!

Thanks and Regards
Noorul