git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Elijah Newren <newren@gmail.com>
Cc: Shourya Shukla <shouryashukla.oo@gmail.com>,
	Git Mailing List <git@vger.kernel.org>,
	"brian m. carlson" <sandals@crustytoothpaste.net>
Subject: Re: [PATCH v4 4/4] gitfaq: fetching and pulling a repository
Date: Wed, 29 Apr 2020 10:19:06 -0700	[thread overview]
Message-ID: <xmqq368mxl9x.fsf@gitster.c.googlers.com> (raw)
In-Reply-To: <CABPp-BFt_5-OyOw9YbYJhhu1P4CJLOi65wdyRckOY5_acRejGg@mail.gmail.com> (Elijah Newren's message of "Wed, 29 Apr 2020 08:56:49 -0700")

Elijah Newren <newren@gmail.com> writes:

>> +       go smoothly or have merge conflicts depending on the case. A pull
>> +       does not allow you to review any changes made upstream but rather
>> +       merge those changes on their own.
>
> I don't understand this last sentence.  You can definitely review
> changes made upstream after a pull; e.g. git log @{u}@{1}..@{u}
>
>> ++
>> +This is the reason why it is sometimes advised to fetch the changes
>> +first and then merge them accordingly because not every change might
>> +be of utility to the user.
>
> I don't understand the purpose of this paragraph.

Readers who need to resort to a FAQ will be at loss when told "it is
sometimes advised to...", as they do not know enough to judge if the
advice applies to their situation themselves.

Don't we have a workflow document?  Not the one that documents the
workflow I use to maintain this project, but outlines various ways
different projects work, describing centralized, triangular, merging
and rebasing, etc.?  I do not think this single entry belongs to a
FAQ list that gives simple answers to common questions without
people having to think.  Similar to the "merge or rebase?" question
(not part of this series), it belongs to "workflow guide", "concepts
manual", and "tutorial" kind of document, I would think.



  reply	other threads:[~2020-04-29 17:19 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-04-29  9:38 [PATCH v4 1/4] gitfaq: files in .gitignore are tracked Shourya Shukla
2020-04-29  9:38 ` [PATCH v4 2/4] gitfaq: changing the remote of a repository Shourya Shukla
2020-04-29 16:17   ` Elijah Newren
2020-04-29 17:01   ` Junio C Hamano
2020-04-29  9:38 ` [PATCH v4 3/4] gitfaq: shallow cloning " Shourya Shukla
2020-04-29 16:00   ` Elijah Newren
2020-05-02  5:00     ` Shourya Shukla
2020-04-29 17:09   ` Junio C Hamano
2020-05-02  6:13     ` Shourya Shukla
2020-05-04 16:06       ` Junio C Hamano
2020-05-05 12:26         ` Derrick Stolee
2021-05-06  2:49           ` dyrone teng
2020-04-29  9:38 ` [PATCH v4 4/4] gitfaq: fetching and pulling " Shourya Shukla
2020-04-29 15:56   ` Elijah Newren
2020-04-29 17:19     ` Junio C Hamano [this message]
2020-05-02  6:57     ` Shourya Shukla
2020-05-02 19:00       ` Elijah Newren
2020-05-03  1:03         ` Junio C Hamano
2020-04-29 16:16 ` [PATCH v4 1/4] gitfaq: files in .gitignore are tracked Elijah Newren
2020-05-02  6:36   ` Shourya Shukla
2020-04-29 16:55 ` Junio C Hamano

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=xmqq368mxl9x.fsf@gitster.c.googlers.com \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=newren@gmail.com \
    --cc=sandals@crustytoothpaste.net \
    --cc=shouryashukla.oo@gmail.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).