From: Ricky Clarkson <ricky.clarkson@gmail.com>
To: git@vger.kernel.org
Subject: I've been pushing to one branch from both git-svn and git
Date: Tue, 4 May 2010 12:43:23 +0100 [thread overview]
Message-ID: <z2h7eeb06461005040443ib2fb7405i39e7d5b4220bfb08@mail.gmail.com> (raw)
Hi,
I have a git repository we'll call the git svn repo, in which I only
perform git svn fetch and git push bare.
bare is a bare git repository, which I push to from a local
repository. The mistake I've been making is to push to the branch
'trunk' in bare, from my local repository. The reason this is a
mistake is because git push bare from the git svn repo also pushes to
there.
Today I've been forced to learn of my mistake, as I cannot push from
the git svn repo without possibly losing commits. It turns out (which
is probably obvious to you all) that I should have been pushing to,
say, bare's 'master' branch instead of its trunk one.
I don't intend to push back to svn from any of these repos, but I
would like to be able to continue pulling changes from svn at least
for the time being. What should I do?
Thanks,
Ricky.
--
Ricky Clarkson
Java and Scala Programmer, AD Holdings
+44 1928 706373
Skype: ricky_clarkson
Google Talk: ricky.clarkson@gmail.com
Google Wave: ricky.clarkson@googlewave.com
next reply other threads:[~2010-05-04 11:43 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-05-04 11:43 Ricky Clarkson [this message]
2010-05-04 16:34 ` I've been pushing to one branch from both git-svn and git Avery Pennarun
2010-05-05 9:09 ` Ricky Clarkson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=z2h7eeb06461005040443ib2fb7405i39e7d5b4220bfb08@mail.gmail.com \
--to=ricky.clarkson@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).