From: Stephen Smith <ischis2@cox.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: Git Mailing List <git@vger.kernel.org>
Subject: Re: How to handle patch series conflicts
Date: Thu, 06 Sep 2018 17:12:08 -0700 [thread overview]
Message-ID: <1749364.tUMQzLrKjK@thunderbird> (raw)
In-Reply-To: 32028230.38oFsPliiV@thunderbird
On Wednesday, September 5, 2018 2:16:06 PM MST Junio C Hamano wrote:
> I think that one that is not even in 'pu' hasn't been looked at for
> a long time; it is probably a good idea to discard and replace, if
> you have something working.
I submitted a working patch set yesterday.
[1] https://public-inbox.org/git/20180906005329.11277-1-ischis2@cox.net/T/
#m3ed5a15721318f71064dbe7225be9242c3960e1c
sps
prev parent reply other threads:[~2018-09-07 0:12 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
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 [this message]
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=1749364.tUMQzLrKjK@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.