From: Stephen & Linda Smith <ischis2@cox.net>
To: Junio C Hamano <gitster@pobox.com>,
Git Mailing List <git@vger.kernel.org>
Subject: How to handle patch series conflicts
Date: Wed, 05 Sep 2018 10:25:17 -0700 [thread overview]
Message-ID: <32028230.38oFsPliiV@thunderbird> (raw)
In-Reply-To: <2293750.yp9BkL5mAn@thunderbird>
Junio -
On Tuesday, September 4, 2018 10:27:26 AM MST Junio C Hamano wrote:
> > t7500-commit.sh
> > t7501-commit.sh
> > t7502-commit.sh
> > t7509-commit.sh
>
> These seem to have organically grown and it is very likely that ones
> later introduced were added more from laziness.
How does the project prefer to handle patches that conflict. Renaming t7501-
commit.sh will conflict with a patch set that I submitted over the weekend
[1]. Should I treat them as totally separate?
On Tuesday, September 4, 2018 3:36:11 PM MST Junio C Hamano wrote:
> * sl/commit-dry-run-with-short-output-fix (2018-07-30) 4 commits
> . commit: fix exit code when doing a dry run
> . wt-status: teach wt_status_collect about merges in progress
> . wt-status: rename commitable to committable
> . t7501: add coverage for flags which imply dry runs
I noted that this patch set is similar to the one that I just submitted. Are
you thinking of not using mine (in which case I will drop it)? If not I will
add a patch to fix the committable spelling[2] and re-roll.
[1] https://public-inbox.org/git/20180901235256.4260-1-ischis2@cox.net/
next prev parent reply other threads:[~2018-09-05 17:25 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-03 18:16 test files with same names? Duy Nguyen
2018-09-04 17:27 ` Junio C Hamano
2018-10-23 3:53 ` [PATCH 0/5] Commit test name clean-up Stephen P. Smith
2018-10-23 3:53 ` [PATCH 1/5] t2000: rename and combine checkout clash tests Stephen P. Smith
2018-10-23 3:53 ` [PATCH 2/5] t7509: cleanup description and filename Stephen P. Smith
2018-10-23 4:03 ` Eric Sunshine
2018-10-23 3:53 ` [PATCH 3/5] t7502: rename commit test script to comply with naming convention Stephen P. Smith
2018-10-23 3:53 ` [PATCH 4/5] t7500: rename commit tests " Stephen P. Smith
2018-10-23 4:05 ` Eric Sunshine
2018-10-23 3:53 ` [PATCH 5/5] t7501: rename commit test " Stephen P. Smith
2018-10-23 4:07 ` Eric Sunshine
2018-09-04 18:04 ` test files with same names? Stephen & Linda Smith
2018-09-05 17:25 ` Stephen & Linda Smith [this message]
2018-09-05 17:27 ` How to handle patch series conflicts Stefan Beller
2018-09-05 21:16 ` Junio C Hamano
2018-10-08 1:28 ` Stephen & Linda Smith
2018-10-09 5:51 ` Junio C Hamano
2018-10-09 13:11 ` Stephen Smith
2018-09-05 21:34 ` Stephen & Linda Smith
2018-09-05 22:03 ` Stephen & Linda Smith
2018-09-07 0:12 ` Stephen Smith
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=32028230.38oFsPliiV@thunderbird \
--to=ischis2@cox.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.