From mboxrd@z Thu Jan 1 00:00:00 1970 Received: by 10.90.87.14 with SMTP id k14cs1200352agb; Tue, 29 Dec 2009 16:02:00 -0800 (PST) Received: by 10.224.109.141 with SMTP id j13mr8441208qap.84.1262131319844; Tue, 29 Dec 2009 16:01:59 -0800 (PST) Return-Path: Received: from rubyforge.org (rubyforge.org [205.234.109.19]) by mx.google.com with ESMTP id 16si19719503qyk.83.2009.12.29.16.01.59; Tue, 29 Dec 2009 16:01:59 -0800 (PST) Received-SPF: pass (google.com: domain of sup-devel-bounces@rubyforge.org designates 205.234.109.19 as permitted sender) client-ip=205.234.109.19; Authentication-Results: mx.google.com; spf=pass (google.com: domain of sup-devel-bounces@rubyforge.org designates 205.234.109.19 as permitted sender) smtp.mail=sup-devel-bounces@rubyforge.org Received: from rubyforge.org (rubyforge.org [127.0.0.1]) by rubyforge.org (Postfix) with ESMTP id 72A321D78867; Tue, 29 Dec 2009 19:01:59 -0500 (EST) Received: from entry.masanjin.net (masanjin.net [209.20.72.13]) by rubyforge.org (Postfix) with ESMTP id E645E18582C9 for ; Tue, 29 Dec 2009 19:01:53 -0500 (EST) Received: from w by entry.masanjin.net with local (Exim 4.69) (envelope-from ) id 1NPm0f-0000Ux-FP for sup-devel@rubyforge.org; Tue, 29 Dec 2009 16:01:53 -0800 From: William Morgan To: sup-devel In-reply-to: <1262127314-sup-3385@tilus.net> References: <1262114695-sup-9446@tilus.net> <1262116690-sup-8655@masanjin.net> <1262117270-sup-1009@tilus.net> <1262118240-sup-4202@ntdws12.chass.utoronto.ca> <1262123514-sup-7661@tilus.net> <1262126992-sup-7312@masanjin.net> <1262127314-sup-3385@tilus.net> Date: Tue, 29 Dec 2009 16:01:53 -0800 Message-Id: <1262130924-sup-285@masanjin.net> User-Agent: Sup/git Subject: Re: [sup-devel] What's your workflow? X-BeenThere: sup-devel@rubyforge.org X-Mailman-Version: 2.1.12 Precedence: list Reply-To: Sup developer discussion List-Id: Sup developer discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: sup-devel-bounces@rubyforge.org Errors-To: sup-devel-bounces@rubyforge.org 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 _______________________________________________ Sup-devel mailing list Sup-devel@rubyforge.org http://rubyforge.org/mailman/listinfo/sup-devel