From: William Morgan <wmorgan-sup@masanjin.net>
To: sup-devel <sup-devel@rubyforge.org>
Subject: Re: [sup-devel] What's your workflow?
Date: Tue, 29 Dec 2009 16:01:53 -0800 [thread overview]
Message-ID: <1262130924-sup-285@masanjin.net> (raw)
In-Reply-To: <1262127314-sup-3385@tilus.net>
Reformatted excerpts from Tero Tilus's message of 2009-12-29:
> Assume I have a feature-branch which is merged to my-daily-sup and I
> go --amend a commit in that feature-branch. How would I now get
> my-daily-sup up to date? (also assume that merge from feature-branch
> is not the tip of my-daily-sup so that git reset HEAD^ && git merge
> feature-branch is not a solution)
If you --amend, then remerging will likely create a conflict. There
might be a way of rebase -i on my-daily-sup to leave off the original
merge commit, or you could "unmerge it" with the horribleness that is
`git revert -m 1` on the original merge commit, leaving daily-sup with
some reverse commits.
The short answer is: don't do that. Avoid things that change the head on
a branch that's been published or merged or otherwise used. Make an
additional commit instead of --amend, or be prepared to do some work.
(I realize this isn't ideal because presumably you're trying to keep
both a clean topic branch and a clean daily-sup branch, but rebasing and
amending necessarily drops the history that git needs to merge changes
properly.)
--
William <wmorgan-sup@masanjin.net>
_______________________________________________
Sup-devel mailing list
Sup-devel@rubyforge.org
http://rubyforge.org/mailman/listinfo/sup-devel
next prev parent reply other threads:[~2009-12-30 0:02 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-12-29 19:34 Tero Tilus
2009-12-29 19:41 ` Edward Z. Yang
2009-12-29 19:58 ` William Morgan
2009-12-29 20:14 ` Tero Tilus
2009-12-29 20:40 ` Ben Walton
2009-12-29 21:58 ` Tero Tilus
2009-12-29 22:51 ` William Morgan
2009-12-29 23:03 ` Tero Tilus
2009-12-30 0:01 ` William Morgan [this message]
2009-12-29 20:43 ` William Morgan
2009-12-29 22:03 ` Tero Tilus
2009-12-29 22:33 ` William Morgan
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=1262130924-sup-285@masanjin.net \
--to=wmorgan-sup@masanjin.net \
--cc=sup-devel@rubyforge.org \
/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