From mboxrd@z Thu Jan 1 00:00:00 1970 Received: by 10.90.87.14 with SMTP id k14cs1194937agb; Tue, 29 Dec 2009 14:08:20 -0800 (PST) Received: by 10.224.104.140 with SMTP id p12mr8310717qao.297.1262124499877; Tue, 29 Dec 2009 14:08:19 -0800 (PST) Return-Path: Received: from rubyforge.org (rubyforge.org [205.234.109.19]) by mx.google.com with ESMTP id 36si5414820qyk.126.2009.12.29.14.08.19; Tue, 29 Dec 2009 14:08:19 -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 039B916782B6; Tue, 29 Dec 2009 17:08:19 -0500 (EST) Received: from kuovi.tilus.net (kuovi.tilus.net [80.68.89.168]) by rubyforge.org (Postfix) with ESMTP id F07841858282 for ; Tue, 29 Dec 2009 17:03:26 -0500 (EST) Received: by kuovi.tilus.net (Postfix, from userid 1000) id 873D03FCCC; Wed, 30 Dec 2009 00:03:26 +0200 (EET) From: Tero Tilus To: sup-devel In-reply-to: <1262118710-sup-1729@masanjin.net> References: <1262114695-sup-9446@tilus.net> <1262116690-sup-8655@masanjin.net> <1262117270-sup-1009@tilus.net> <1262118710-sup-1729@masanjin.net> Date: Wed, 30 Dec 2009 00:03:26 +0200 Message-Id: <1262123932-sup-7232@tilus.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 William Morgan, 2009-12-29 22:43: > If you have feature branches merged into daily-sup, I think you need > to use `git rebase -p next` to get it to recreate those merges. But > I've never gotten that complex. If _you_ haven't done that it makes me think I'm seriously overengineering something here (or is it just because you are the maintainer and aren't pulling your next from anybody?) What is your daily-sup? -- Tero Tilus ## 050 3635 235 ## http://tero.tilus.net/ _______________________________________________ Sup-devel mailing list Sup-devel@rubyforge.org http://rubyforge.org/mailman/listinfo/sup-devel