From: Jonathan Nieder <jrnieder@gmail.com>
To: Thomas Ackermann <th.acker@arcor.de>
Cc: git@vger.kernel.org, gitster@pobox.com, wking@tremily.us
Subject: Re: [PATCH 07/13] Improve description in "How to merge"
Date: Sat, 24 Aug 2013 22:08:20 -0700 [thread overview]
Message-ID: <20130825050820.GJ2882@elie.Belkin> (raw)
In-Reply-To: <8609038.1091034.1377329428557.JavaMail.ngmail@webmail08.arcor-online.net>
Thomas Ackermann wrote:
> Describe the conflict resolution in terms of the
> commands the user is supposed to use.
[...]
> --- a/Documentation/user-manual.txt
> +++ b/Documentation/user-manual.txt
> @@ -1251,10 +1251,8 @@ Automatic merge failed; fix conflicts and then commit the result.
> -------------------------------------------------
>
> Conflict markers are left in the problematic files, and after
> -you resolve the conflicts manually, you can update the index
> -with the contents and run Git commit, as you normally would when
> -creating a new file.
Hm. It's been too long since I was a novice, since I find the above
clear already.
To make the text clearer, I think it would be best to *add* an example
instead of replacing it by one.
Thanks,
Jonathan
next prev parent reply other threads:[~2013-08-25 5:08 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-24 7:22 [PATCH 0/13] Modernize user-manual Thomas Ackermann
2013-08-24 7:24 ` [PATCH 01/13] Call it "Git User Manual" and remove reference to very old Git version Thomas Ackermann
2013-08-25 3:05 ` Jonathan Nieder
2013-08-25 3:07 ` Junio C Hamano
2013-08-24 7:25 ` [PATCH 02/13] Use current "detached HEAD" message Thomas Ackermann
2013-08-25 3:49 ` Jonathan Nieder
2013-08-25 8:10 ` Aw: " Thomas Ackermann
2013-08-24 7:26 ` [PATCH 03/13] Use current output for "git repack" Thomas Ackermann
2013-08-25 4:15 ` Jonathan Nieder
2013-08-25 8:37 ` Aw: " Thomas Ackermann
2013-08-24 7:27 ` [PATCH 04/13] Use "git merge" instead of "git pull ." Thomas Ackermann
2013-08-25 3:17 ` Junio C Hamano
2013-08-25 4:19 ` Jonathan Nieder
2013-08-25 5:26 ` Martin von Zweigbergk
2013-08-24 7:28 ` [PATCH 05/13] Fix some typos Thomas Ackermann
2013-08-25 5:01 ` Jonathan Nieder
2013-08-25 9:13 ` Aw: " Thomas Ackermann
2013-08-24 7:29 ` [PATCH 06/13] Simplify "How to make a commit" Thomas Ackermann
2013-08-25 3:20 ` Junio C Hamano
2013-08-25 5:05 ` Jonathan Nieder
2013-08-25 9:20 ` Aw: " Thomas Ackermann
2013-08-24 7:30 ` [PATCH 07/13] Improve description in "How to merge" Thomas Ackermann
2013-08-25 3:22 ` Junio C Hamano
2013-08-25 5:08 ` Jonathan Nieder [this message]
2013-08-25 11:31 ` Aw: " Thomas Ackermann
2013-08-24 7:31 ` [PATCH 08/13] Improve section "Manipulating branches" Thomas Ackermann
2013-08-25 3:25 ` Junio C Hamano
2013-08-25 11:41 ` Aw: " Thomas Ackermann
2013-08-24 7:32 ` [PATCH 09/13] Improve section "Merge multiple trees" Thomas Ackermann
2013-08-25 5:23 ` Jonathan Nieder
2013-08-25 12:06 ` Aw: " Thomas Ackermann
2013-08-25 20:10 ` Jonathan Nieder
2013-08-24 7:33 ` [PATCH 10/13] Remove unnecessary historical note from "Object storage format" Thomas Ackermann
2013-08-25 3:28 ` Junio C Hamano
2013-08-24 7:34 ` [PATCH 11/13] Remove obscure reference from "Examples" Thomas Ackermann
2013-08-25 3:53 ` Junio C Hamano
2013-08-25 5:25 ` Jonathan Nieder
2013-08-25 9:30 ` Aw: " Thomas Ackermann
2013-08-24 7:35 ` [PATCH 12/13] Remove irrelevant reference from "Tying it all together" Thomas Ackermann
2013-08-25 3:56 ` Junio C Hamano
2013-08-26 13:51 ` Jon Loeliger
2013-08-24 7:37 ` [PATCH 13/13] "git prune" is safe now Thomas Ackermann
2013-08-25 3:59 ` Junio C Hamano
2013-08-24 19:31 ` [PATCH 0/13] Modernize user-manual Philip Oakley
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=20130825050820.GJ2882@elie.Belkin \
--to=jrnieder@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=th.acker@arcor.de \
--cc=wking@tremily.us \
/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.
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 NNTP newsgroup(s).