Return-Path: X-Original-To: apmail-streams-dev-archive@minotaur.apache.org Delivered-To: apmail-streams-dev-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 694DF1139C for ; Thu, 24 Apr 2014 16:19:20 +0000 (UTC) Received: (qmail 58434 invoked by uid 500); 24 Apr 2014 16:19:19 -0000 Delivered-To: apmail-streams-dev-archive@streams.apache.org Received: (qmail 58371 invoked by uid 500); 24 Apr 2014 16:19:19 -0000 Mailing-List: contact dev-help@streams.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@streams.incubator.apache.org Delivered-To: mailing list dev@streams.incubator.apache.org Received: (qmail 58346 invoked by uid 99); 24 Apr 2014 16:19:18 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 24 Apr 2014 16:19:17 +0000 X-ASF-Spam-Status: No, hits=2.2 required=5.0 tests=HTML_MESSAGE,SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (nike.apache.org: domain of rdouglas@w2odigital.com designates 74.201.97.202 as permitted sender) Received: from [74.201.97.202] (HELO mxout.myoutlookonline.com) (74.201.97.202) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 24 Apr 2014 16:19:10 +0000 Received: from mxout.myoutlookonline.com (localhost [127.0.0.1]) by mxout.myoutlookonline.com (Postfix) with ESMTP id E4D66416862 for ; Thu, 24 Apr 2014 12:18:56 -0400 (EDT) X-Virus-Scanned: by SpamTitan at mail.lan Received: from HUB025.mail.lan (unknown [10.110.2.1]) by mxout.myoutlookonline.com (Postfix) with ESMTP id 5A5CC416847 for ; Thu, 24 Apr 2014 12:18:56 -0400 (EDT) Received: from CCRD014.mail.lan ([192.168.100.55]) by HUB025.mail.lan ([10.110.17.25]) with mapi; Thu, 24 Apr 2014 12:18:46 -0400 From: "Robert Douglas [W2O Digital]" To: "dev@streams.incubator.apache.org" Date: Thu, 24 Apr 2014 12:18:45 -0400 Subject: Best way to merge in code Thread-Topic: Best way to merge in code Thread-Index: Ac9f2N3gzhw9a71iTPmPU6yXGPZMsA== Message-ID: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: user-agent: Microsoft-MacOutlook/14.3.9.131030 acceptlanguage: en-US Content-Type: multipart/alternative; boundary="_000_CF7EA3954A2Erdouglasw2odigitalcom_" MIME-Version: 1.0 X-Virus-Checked: Checked by ClamAV on apache.org --_000_CF7EA3954A2Erdouglasw2odigitalcom_ Content-Type: text/plain; charset="Windows-1252" Content-Transfer-Encoding: quoted-printable Hi all, I=92ve been working on https://issues.apache.org/jira/browse/STREAMS-62 and= was curious what everyone thought was the best way to go about merging in = new code. Now that Streams is mirrored on GitHub I can fork that repository= and create a pull request or alternatively I can attach a patch file, whic= hever is easier. Thanks, Robert Douglas --_000_CF7EA3954A2Erdouglasw2odigitalcom_--