From: Junio C Hamano <gitster@pobox.com>
To: Alex Henrie <alexhenrie24@gmail.com>
Cc: git@vger.kernel.org, git@matthieu-moy.fr, christiwald@gmail.com,
john@keeping.me.uk, philipoakley@iee.email,
phillip.wood123@gmail.com, phillip.wood@dunelm.org.uk
Subject: Re: [PATCH v3 1/2] remote: advise about force-pushing as an alternative to reconciliation
Date: Sat, 08 Jul 2023 18:38:19 -0700 [thread overview]
Message-ID: <xmqqbkgl6f04.fsf@gitster.g> (raw)
In-Reply-To: CAMMLpeQ2P+qQxo17dEdWhMHcmAfTiBoEifp2wUjWVrP+oGSzxQ@mail.gmail.com
Alex Henrie <alexhenrie24@gmail.com> writes:
> I agree, showing this message in the middle of `git commit` is not
> ideal. However, that's a separate issue that can be fixed later; it's
> not part of the problem I'm trying to solve in this series.
That is debatable. Even "by the way you can pull and reconcile
early before you have fully finished working on the topic and are
ready to push back" is irrelevant during `git commit`. "Reconciling
the differences is not the only way to deal with divergence; you may
decide to simply discard what they have with push --force" is even
less relevant at that time. So it seems to be very much an integral
part of the problem you are tackling, at least to me.
next prev parent reply other threads:[~2023-07-09 1:40 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-02 20:08 [PATCH 0/2] advise about force-pushing as an alternative to reconciliation Alex Henrie
2023-07-02 20:08 ` [PATCH 1/2] remote: " Alex Henrie
2023-07-02 20:08 ` [PATCH 2/2] push: " Alex Henrie
2023-07-03 15:33 ` [PATCH 0/2] " Phillip Wood
2023-07-03 16:26 ` Alex Henrie
2023-07-04 21:44 ` Junio C Hamano
2023-07-04 22:24 ` Alex Henrie
2023-07-05 5:30 ` Junio C Hamano
2023-07-06 2:32 ` Alex Henrie
2023-07-04 19:47 ` [PATCH v2 " Alex Henrie
2023-07-04 19:47 ` [PATCH v2 1/2] remote: " Alex Henrie
2023-07-04 21:51 ` Junio C Hamano
2023-07-04 22:41 ` Alex Henrie
2023-07-04 19:47 ` [PATCH v2 2/2] push: " Alex Henrie
2023-07-06 4:01 ` [PATCH v3 0/2] " Alex Henrie
2023-07-06 4:01 ` [PATCH v3 1/2] remote: " Alex Henrie
2023-07-06 20:25 ` Junio C Hamano
2023-07-06 20:40 ` Junio C Hamano
2023-07-06 23:23 ` Alex Henrie
2023-07-07 17:35 ` Junio C Hamano
2023-07-07 17:52 ` Junio C Hamano
2023-07-08 18:55 ` Alex Henrie
2023-07-09 1:38 ` Junio C Hamano [this message]
2023-07-10 4:44 ` Alex Henrie
2023-07-11 0:55 ` Junio C Hamano
2023-07-12 4:47 ` Alex Henrie
2023-07-12 15:18 ` Junio C Hamano
2023-07-13 4:09 ` Alex Henrie
2023-07-07 8:48 ` Phillip Wood
2023-07-06 4:01 ` [PATCH v3 2/2] push: " Alex Henrie
2023-07-07 8:49 ` Phillip Wood
2023-07-07 18:44 ` Junio C Hamano
2023-07-08 18:56 ` Alex Henrie
2023-07-11 18:33 ` Phillip Wood
2023-07-12 4:47 ` Alex Henrie
2023-07-12 4:55 ` Alex Henrie
2023-07-07 5:42 ` [PATCH v4 0/2] " Alex Henrie
2023-07-07 5:42 ` [PATCH v4 1/2] remote: " Alex Henrie
2023-07-07 5:42 ` [PATCH v4 2/2] push: " Alex Henrie
2023-07-13 4:41 ` [PATCH v5 0/3] don't imply that integration is always required before pushing Alex Henrie
2023-07-13 4:41 ` [PATCH v5 1/3] wt-status: don't show divergence advice when committing Alex Henrie
2023-07-13 4:41 ` [PATCH v5 2/3] remote: don't imply that integration is always required before pushing Alex Henrie
2023-07-13 4:41 ` [PATCH v5 3/3] push: " Alex Henrie
2023-07-13 9:51 ` [PATCH v5 0/3] " Phillip Wood
2023-07-13 16:15 ` 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqbkgl6f04.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=alexhenrie24@gmail.com \
--cc=christiwald@gmail.com \
--cc=git@matthieu-moy.fr \
--cc=git@vger.kernel.org \
--cc=john@keeping.me.uk \
--cc=philipoakley@iee.email \
--cc=phillip.wood123@gmail.com \
--cc=phillip.wood@dunelm.org.uk \
/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).