From: Stefan Beller <sbeller@google.com>
To: "Stephen & Linda Smith" <ischis2@cox.net>
Cc: Junio C Hamano <gitster@pobox.com>, git <git@vger.kernel.org>
Subject: Re: How to handle patch series conflicts
Date: Wed, 5 Sep 2018 10:27:26 -0700 [thread overview]
Message-ID: <CAGZ79kb5MnUyX9BkFDyFQ7HQ4nXGeo66OUHMPaumfeHgM7e46w@mail.gmail.com> (raw)
In-Reply-To: <32028230.38oFsPliiV@thunderbird>
On Wed, Sep 5, 2018 at 10:25 AM Stephen & Linda Smith <ischis2@cox.net> wrote:
>
> 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?
When doing a rename, this should merge fine without much complication,
so I'd think it is fine to treat them separately. That way they can be merged
to next/master independently.
next prev parent reply other threads:[~2018-09-05 17:27 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 ` How to handle patch series conflicts Stephen & Linda Smith
2018-09-05 17:27 ` Stefan Beller [this message]
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=CAGZ79kb5MnUyX9BkFDyFQ7HQ4nXGeo66OUHMPaumfeHgM7e46w@mail.gmail.com \
--to=sbeller@google.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=ischis2@cox.net \
/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).