git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Stephen Bash <bash@genarts.com>
To: Jeff King <peff@peff.net>
Cc: git@vger.kernel.org, Tony Finch <dot@dotat.at>
Subject: Re: A workflow for local patch maintenance
Date: Fri, 11 Oct 2013 09:22:28 -0400 (EDT)	[thread overview]
Message-ID: <247350414.2015225.1381497748024.JavaMail.root@genarts.com> (raw)
In-Reply-To: <20131010173628.GB24782@sigill.intra.peff.net>

----- Original Message -----
> From: "Jeff King" <peff@peff.net>
> Sent: Thursday, October 10, 2013 1:36:28 PM
> Subject: Re: A workflow for local patch maintenance
> 
> ... snip ...
>
> That being said, there are some new downsides, as you noted:
> 
>   1. Resolving conflicts between your version and the reworked
>   upstream version can be a pain.
> 
> ... snip ...
> 
> To mitigate problem 1, I will sometimes revert a local topic before
> doing the upstream merge, if I know it has been reworked.

Peff (slightly off topic) - A coworker of mine actually ran into this
problem earlier this week.  Is there recommended way to revert a merged
topic branch?  I assume it's essentially reverted each commit introduced
by the branch, but is there a convenient invocation of revert? (easy to 
remember and hard to screw up)

Thanks,
Stephen

  parent reply	other threads:[~2013-10-11 13:31 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-10-08 18:12 A workflow for local patch maintenance Tony Finch
2013-10-10  1:33 ` Jeff King
2013-10-10 16:53   ` Tony Finch
2013-10-10 17:36     ` Jeff King
2013-10-10 19:18       ` Jonathan Nieder
2013-10-11 13:22       ` Stephen Bash [this message]
2013-10-11 15:16         ` Jeff King
2013-10-11 15:30           ` Stephen Bash

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=247350414.2015225.1381497748024.JavaMail.root@genarts.com \
    --to=bash@genarts.com \
    --cc=dot@dotat.at \
    --cc=git@vger.kernel.org \
    --cc=peff@peff.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. 
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).