From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A3210138334 for ; Wed, 12 Dec 2018 11:33:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5F223E0B83; Wed, 12 Dec 2018 11:33:45 +0000 (UTC) Received: from Sindri.troglodyte.be (sindri.troglodyte.be [51.15.219.152]) by pigeon.gentoo.org (Postfix) with ESMTP id 33DF1E0B83 for ; Wed, 12 Dec 2018 11:33:44 +0000 (UTC) Received: from cloud.troglodyte.be (localhost [127.0.0.1]) by Sindri.troglodyte.be (Postfix) with ESMTPSA id 8D1A7800B3 for ; Wed, 12 Dec 2018 12:34:20 +0100 (CET) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Proxy Maintainers X-BeenThere: gentoo-proxy-maint@gentoo.org X-BeenThere: gentoo-proxy-maint@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply MIME-Version: 1.0 Date: Wed, 12 Dec 2018 11:34:20 +0000 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Mailer: RainLoop/1.12.1 From: "=?utf-8?B?Q29yZW50aW4g4oCcTmFkb+KAnSBQYXpkZXJh?=" Message-ID: Subject: Re: [gentoo-proxy-maint] local branch gone To: gentoo-proxy-maint@lists.gentoo.org In-Reply-To: <1959854123.3123203.1544601371408@mail.yahoo.com> References: <1959854123.3123203.1544601371408@mail.yahoo.com> <1959854123.3123203.1544601371408.ref@mail.yahoo.com> X-Archives-Salt: afa3c255-b892-41d0-9f1e-a7509b993c11 X-Archives-Hash: 3c243098ff0940ec8eb377578a408316 December 12, 2018 8:56 AM, "Vieri" wrote:=0A=0A> Hi= ,=0A> =0A> I'm new to git so please be kind. :-)=0A> =0A> This is what I = do when I contribute for CATEGORY/PACKAGE to github:=0A> =0A> $ git check= out -b CATEGORY/PACKAGE master=0A> $ repoman manifest =0A> $ git add file= 1 file2 file3...=0A> $ repoman -dx full =0A> $ repoman -dx commit =0A> $ = git push --no-signed github CATEGORY/PACKAGE=0AWhy --no-signed?=0A=0A> Th= at seems to work as expected.=0A> However, suppose CATEGORY/PACKAGE does = not exist in the master repository (gentoo/gentoo at=0A> github). So it's= a NEW package contrib.=0A> Also suppose that I don't want to wait for ge= ntoo dev feedback on this particular contrib, and I=0A> want to move on a= nd contribute another package.=0A> So I won't be issuing this just yet:= =0A> =0A> $ git branch -d CATEGORY/PACKAGE=0A> =0A> Instead, I will try t= o resync/update the main tree just in case there are some changes, and th= en=0A> fork a new branch.=0A> So this is what I do:=0A> =0A> $ git pull g= entoo master =0A> $ git checkout -b CATEGORY/ANOTHER_PACKAGE master =0A> = =0A> So I'm guessing that "git pull gentoo master" is the culprit as it m= ight erase my CATEGORY/PACKAGE=0A> directory.=0A> =0A> How can I avoid th= is?=0A> What's the best practice?=0A=0AI think you're looking for git reb= ase, there are tons of examples so I'll leave that to you, and simply put= , that allows you to mess with history, which is useful to resync your wo= rk on top of the master branch.=0Agit pull --rebase specifically helps fo= r that last case.=0A=0ACorentin =E2=80=9CNado=E2=80=9D Pazdera