From mboxrd@z Thu Jan  1 00:00:00 1970
From: Greg Troxel <gdt@ir.bbn.com>
Subject: Re: Git pull has merge conflict
Date: Sat, 30 Oct 2010 09:32:16 -0400
Message-ID: <rmiy69fn6vz.fsf@fnord.ir.bbn.com>
References: <AANLkTi=DV6F8XcuJ9GKr=H1H05e=cjUxvx02gMav=bT0@mail.gmail.com>
Mime-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0639198437=="
Return-path: <emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org>
Received: from [140.186.70.92] (port=47864 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1PCBXi-0005lD-T0
	for emacs-orgmode@gnu.org; Sat, 30 Oct 2010 09:32:23 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gdt@ir.bbn.com>) id 1PCBXe-0000UL-Ic
	for emacs-orgmode@gnu.org; Sat, 30 Oct 2010 09:32:22 -0400
Received: from fnord.ir.bbn.com ([192.1.100.210]:58758)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gdt@ir.bbn.com>) id 1PCBXe-0000Th-Gj
	for emacs-orgmode@gnu.org; Sat, 30 Oct 2010 09:32:18 -0400
In-Reply-To: <AANLkTi=DV6F8XcuJ9GKr=H1H05e=cjUxvx02gMav=bT0@mail.gmail.com>
	(Noorul Islam's message of "Sat, 30 Oct 2010 09:29:03 +0530")
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: Noorul Islam <noorul@noorul.com>
Cc: emacs-org list <emacs-orgmode@gnu.org>

--===============0639198437==
Content-Type: multipart/signed; boundary="=-=-=";
	micalg=pgp-sha1; protocol="application/pgp-signature"

--=-=-=
Content-Type: text/plain


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.

--=-=-=
Content-Type: application/pgp-signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (NetBSD)

iEYEARECAAYFAkzMHmAACgkQ+vesoDJhHiV0CgCeNRPdJf7/s7VKQifyl8xAw5t3
eTIAni2ZO3Dte2utbGjCFKGi3ii3yMDC
=+DCp
-----END PGP SIGNATURE-----
--=-=-=--


--===============0639198437==
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

_______________________________________________
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

--===============0639198437==--