From mboxrd@z Thu Jan 1 00:00:00 1970 Received: by 10.42.240.136 with SMTP id la8cs160513icb; Thu, 10 Feb 2011 15:48:20 -0800 (PST) Received: by 10.90.65.7 with SMTP id n7mr3318629aga.179.1297381699312; Thu, 10 Feb 2011 15:48:19 -0800 (PST) Return-Path: Received: from rubyforge.org (rubyforge.org [205.234.109.19]) by mx.google.com with ESMTP id w10si211269vbp.76.2011.02.10.15.48.18; Thu, 10 Feb 2011 15:48: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; dkim=neutral (body hash did not verify) header.i=@gmail.com Received: from rubyforge.org (rubyforge.org [127.0.0.1]) by rubyforge.org (Postfix) with ESMTP id 8911A19782DB; Thu, 10 Feb 2011 18:48:18 -0500 (EST) Received: from mail-wy0-f178.google.com (mail-wy0-f178.google.com [74.125.82.178]) by rubyforge.org (Postfix) with ESMTP id C5A841858387 for ; Thu, 10 Feb 2011 18:26:34 -0500 (EST) Received: by wyb42 with SMTP id 42so2013182wyb.23 for ; Thu, 10 Feb 2011 15:26:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:content-type:subject:from:to:date:message-id :user-agent:content-transfer-encoding; bh=UdwgidUoyFhlRnEcL78gek1EEZzsXkPhXGq4NFf26pM=; b=wn2a7l5z+gD728mi3CWF/RkTsguoAz6IGjEPG3B2WCYkkEkiG93dVAV3zE5Kx0vYMa QUWGJg/iooPDB1cAUOsSAjOBjy1dJvI9l4JytQgyaGE4eSoWi+RrMIO1LvqPvmacYjWB BHwjvfWEKn7OZuSDd53pdRQznp6uTvLOtIh1E= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=content-type:subject:from:to:date:message-id:user-agent :content-transfer-encoding; b=DLC9rrdb/9sBlh5U4cHhEFLWXVVewekWlLWS4+UxDGbmF+AfHpp7/r9MAghPi6Nc9X PJ3OcugcDE0jtKiKWYVIHNYFVeelehXKY6xsjTwEZAnSnfX5iX5feqeV2wR9ieupBtwH wREHOJiQbamULc6ryyB1zUBte061TtecrDy7s= Received: by 10.227.147.14 with SMTP id j14mr1776513wbv.98.1297380394117; Thu, 10 Feb 2011 15:26:34 -0800 (PST) Received: from localhost (cpc12-cmbg15-2-0-cust81.5-4.cable.virginmedia.com [86.30.247.82]) by mx.google.com with ESMTPS id j49sm64839wer.38.2011.02.10.15.26.30 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 10 Feb 2011 15:26:33 -0800 (PST) From: Hamish To: sup-devel Date: Thu, 10 Feb 2011 23:26:29 +0000 Message-Id: <1297380057-sup-9005@whisper> User-Agent: Sup/git Subject: [sup-devel] branching and merging 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 Hello I'm wondering if there are preferred strategies for the feature branches. I'm aware that new branches should be branched off master, and merged into next when the author thinks they're ready. But I'm wondering when a merge has been done from a branch, should development continue on that branch? I've been working on the gpgme branch, even though a number of the earlier commits on that branch have been merged into master. So I've been using git cherry-pick to merge later commits into next. Is that a reasonable way to go or should I be starting lots of little branches, or merging into next less often? Or does it just not make much difference to the maintainers and I should do what works for me? Any opinions? Hamish _______________________________________________ Sup-devel mailing list Sup-devel@rubyforge.org http://rubyforge.org/mailman/listinfo/sup-devel