From: Alan Chandler <alan@chandlerfamily.org.uk>
To: git@vger.kernel.org
Cc: Wink Saville <wink@saville.com>
Subject: Re: Resolving conflicts
Date: Fri, 1 Dec 2006 07:30:25 +0000 [thread overview]
Message-ID: <200612010730.25700.alan@chandlerfamily.org.uk> (raw)
In-Reply-To: <456FD461.4080002@saville.com>
On Friday 01 December 2006 07:06, Wink Saville wrote:
...
> git-pull . master
>
> But that failed:
I am not the worlds expert in this, but since most seem to be in bed I'll
attempt to answer you
...
> CONFLICT (content): Merge conflict in kernel/fork.c
> Auto-merging kernel/spinlock.c
> CONFLICT (content): Merge conflict in kernel/spinlock.c
These show that these two files had some conflicts in the contents from the
kernel and your local branch
...
> And git-status shows:
...
> # Changed but not updated:
> # (use git-update-index to mark for commit)
> #
> # unmerged: kernel/fork.c
> # modified: kernel/fork.c
> # unmerged: kernel/spinlock.c
> # modified: kernel/spinlock.c
> #
>
> So what have I done wrong?
Nothing - its asking you to manually resolve the conflict.
> Did the pull complete and I just need to resolve this or
> do I need to redo the git-pull?
Take a look in these two files - you should see conflict markers of the form
<<<<<<<<<<<<<<<<
some content
================
some other content
>>>>>>>>>>>>>>>>
which is the contents that failed from your side and the new version of the
kernel you pulled in.
Edit so the files have sensible content
then use
git update-index <filename>
to tell git that that particular conflict has been resolved.
When you have done that for both files
just do
git commit
--
Alan Chandler
next prev parent reply other threads:[~2006-12-01 7:30 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-12-01 7:06 Resolving conflicts Wink Saville
2006-12-01 7:30 ` Alan Chandler [this message]
2006-12-01 7:41 ` Wink Saville
2006-12-01 8:10 ` Alan Chandler
2006-12-01 7:39 ` Linus Torvalds
2006-12-01 7:52 ` Wink Saville
2006-12-01 7:57 ` Linus Torvalds
2006-12-01 8:00 ` Linus Torvalds
2006-12-01 8:13 ` Alan Chandler
2006-12-01 8:22 ` Wink Saville
2006-12-01 23:47 ` Alan Chandler
2006-12-02 3:04 ` Wink Saville
2006-12-02 4:30 ` Linus Torvalds
2006-12-02 7:55 ` Junio C Hamano
2006-12-02 10:49 ` using xdl_merge(), was " Johannes Schindelin
2006-12-05 17:58 ` Ramsay Jones
2006-12-05 18:28 ` Linus Torvalds
2006-12-05 18:43 ` Junio C Hamano
2006-12-05 18:53 ` Johannes Schindelin
2006-12-05 19:50 ` Junio C Hamano
2006-12-05 21:15 ` [PATCH] xdl_merge(): fix and simplify conflict handling Johannes Schindelin
2006-12-05 22:10 ` Junio C Hamano
2006-12-05 22:24 ` Johannes Schindelin
2006-12-05 22:54 ` Junio C Hamano
2006-12-05 22:27 ` Jakub Narebski
2006-12-05 22:27 ` Johannes Schindelin
2006-12-06 9:48 ` using xdl_merge(), was Re: Resolving conflicts Junio C Hamano
2006-12-06 10:02 ` Johannes Schindelin
2006-12-06 10:13 ` Junio C Hamano
2006-12-06 10:47 ` Johannes Schindelin
2006-12-05 18:36 ` Johannes Schindelin
2006-12-01 7:53 ` Linus Torvalds
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: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=200612010730.25700.alan@chandlerfamily.org.uk \
--to=alan@chandlerfamily.org.uk \
--cc=git@vger.kernel.org \
--cc=wink@saville.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://80x24.org/mirrors/git.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).