From: Greg Troxel <gdt@ir.bbn.com>
To: Noorul Islam <noorul@noorul.com>
Cc: emacs-org list <emacs-orgmode@gnu.org>
Subject: Re: Git pull has merge conflict
Date: Sat, 30 Oct 2010 09:32:16 -0400 [thread overview]
Message-ID: <rmiy69fn6vz.fsf@fnord.ir.bbn.com> (raw)
In-Reply-To: <AANLkTi=DV6F8XcuJ9GKr=H1H05e=cjUxvx02gMav=bT0@mail.gmail.com> (Noorul Islam's message of "Sat, 30 Oct 2010 09:29:03 +0530")
[-- Attachment #1.1: Type: text/plain, Size: 609 bytes --]
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.
[-- Attachment #1.2: Type: application/pgp-signature, Size: 194 bytes --]
[-- Attachment #2: Type: text/plain, Size: 201 bytes --]
_______________________________________________
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
next prev parent reply other threads:[~2010-10-30 13:32 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 [this message]
2010-10-30 14:00 ` Noorul Islam
2010-10-30 14:01 ` Noorul Islam
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
List information: https://www.orgmode.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=rmiy69fn6vz.fsf@fnord.ir.bbn.com \
--to=gdt@ir.bbn.com \
--cc=emacs-orgmode@gnu.org \
--cc=noorul@noorul.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 public inbox
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).