From: Noorul Islam <noorul@noorul.com>
To: Greg Troxel <gdt@ir.bbn.com>
Cc: emacs-org list <emacs-orgmode@gnu.org>
Subject: Re: Git pull has merge conflict
Date: Sat, 30 Oct 2010 19:31:44 +0530 [thread overview]
Message-ID: <AANLkTi=7K10pbvv6P0qp26m-t0KsaHDOjgmi_=rhRfmx@mail.gmail.com> (raw)
In-Reply-To: <rmiy69fn6vz.fsf@fnord.ir.bbn.com>
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.
>
Btw I did not have any local changes/commits. But still the merge failed.
Thank you!
Noorul
prev parent reply other threads:[~2010-10-30 14:01 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
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 [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='AANLkTi=7K10pbvv6P0qp26m-t0KsaHDOjgmi_=rhRfmx@mail.gmail.com' \
--to=noorul@noorul.com \
--cc=emacs-orgmode@gnu.org \
--cc=gdt@ir.bbn.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.