emacs-orgmode
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [Orgmode] Git pull has merge conflict


From: Greg Troxel
Subject: Re: [Orgmode] Git pull has merge conflict
Date: Sat, 30 Oct 2010 09:32:16 -0400
User-agent: Gnus/5.110011 (No Gnus v0.11) Emacs/23.2 (berkeley-unix)

Noorul Islam <address@hidden> writes:

> I am not sure why this conflict is arising even after resetting to
> head and then doing a pull
>
> $ address@hidden:~/emacs/org-mode$ git reset --hard
> HEAD is now at ba6b6f3 Merge branch 'master' of git://repo.or.cz/org-mode
>
> $ address@hidden:~/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.

Attachment: pgpfb1vaiWRDL.pgp
Description: PGP signature


reply via email to

[Prev in Thread] Current Thread [Next in Thread]