Return-Path: X-Original-To: apmail-incubator-cloudstack-dev-archive@minotaur.apache.org Delivered-To: apmail-incubator-cloudstack-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 A6D83E398 for ; Fri, 8 Feb 2013 17:04:34 +0000 (UTC) Received: (qmail 77355 invoked by uid 500); 8 Feb 2013 17:04:34 -0000 Delivered-To: apmail-incubator-cloudstack-dev-archive@incubator.apache.org Received: (qmail 77269 invoked by uid 500); 8 Feb 2013 17:04:34 -0000 Mailing-List: contact cloudstack-dev-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list cloudstack-dev@incubator.apache.org Received: (qmail 77259 invoked by uid 99); 8 Feb 2013 17:04:34 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 08 Feb 2013 17:04:34 +0000 X-ASF-Spam-Status: No, hits=-2.3 required=5.0 tests=RCVD_IN_DNSWL_MED,SPF_HELO_PASS,SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (athena.apache.org: domain of pranav.saxena@citrix.com designates 203.166.19.134 as permitted sender) Received: from [203.166.19.134] (HELO SMTP.CITRIX.COM.AU) (203.166.19.134) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 08 Feb 2013 17:04:29 +0000 X-IronPort-AV: E=Sophos;i="4.84,630,1355097600"; d="scan'208";a="763161" Received: from banpmailmx01.citrite.net ([10.103.128.73]) by SYDPIPO01.CITRIX.COM.AU with ESMTP/TLS/RC4-MD5; 08 Feb 2013 17:04:06 +0000 Received: from BANPMAILBOX01.citrite.net ([10.103.128.71]) by BANPMAILMX01.citrite.net ([10.103.128.73]) with mapi; Fri, 8 Feb 2013 22:34:04 +0530 From: Pranav Saxena To: Mike Tutkowski , "cloudstack-dev@incubator.apache.org" Date: Fri, 8 Feb 2013 22:33:32 +0530 Subject: RE: Git Branching Question Thread-Topic: Git Branching Question Thread-Index: Ac4GGE032MnALZh0Qk2Wn7zrSHVOZQABRhXQ Message-ID: <67EF18FDCA335F489B366120481AB6C5F6BCF0ED6E@BANPMAILBOX01.citrite.net> References: In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: acceptlanguage: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Virus-Checked: Checked by ClamAV on apache.org Hey Mike ,=20 Assuming you have done your changes on the storage-refactor branch but you = haven't committed or staged them and then you checkout to a new branch (git= checkout -b "mike_temp" ) , then your changes would still be shown in the = new branch . You could do a "git status" to verify your list of changes bef= ore and after you checked out to a new branch.=20 Regards, Pranav -----Original Message----- From: Mike Tutkowski [mailto:mike.tutkowski@solidfire.com]=20 Sent: Friday, February 08, 2013 9:51 PM To: cloudstack-dev@incubator.apache.org Subject: Git Branching Question Hi everyone, I'm somewhat new to Git (mainly used SVN). I am currently working on the storage_refactor branch. I've added some cod= e and changed a little existing code, but not staged or committed it to my = local repo. After I added and modified code, I was advised it would be better for me to= branch from storage_refactor and put my code in that branch (pulling from = storage_refactor as I go). My question is this: With un-tracked files and modified files from the sto= rage_refactor branch (again, nothing staged or committed), if I branch from= storage_refactor, where will my un-tracked files and modified files end up= ? Will they be in my new branch and the storage_refactor branch will look = as if I never did anything in it (that would be ideal)? Thanks! -- *Mike Tutkowski* *Senior CloudStack Developer, SolidFire Inc.* e: mike.tutkowski@solidfire.com o: 303.746.7302 Advancing the way the world uses the cloud *(tm)*