From: gitlist <gitlist@myword.co.uk>
To: git@vger.kernel.org
Subject: "Resetting" a repository
Date: Tue, 27 Sep 2011 16:24:23 +0100 [thread overview]
Message-ID: <4E81EAA7.5030708@myword.co.uk> (raw)
I have a project with a test repository and a live repository (and a
development repository).
Over time, the test repository has had merges which were in a quite
different order to the live repository, so it no longer fulfills its
role of being pretty much like the live repository and therefore a good
place to test. The two have diverged too far.
We've reached a point in the project when it would be good to reset the
test repository so that it is exactly the same as the live one. We can
then merge new work from the development repository.
I think that if I just merge the live repository into the test
respository it will not remove extra (non-conflicting) code. On this
occasion I want to remove all extra code and resolve all conflicts in
favour of the live repository version.
I'd appreciate advice on the best way to do this.
Thanks
Roddie Grant
next reply other threads:[~2011-09-27 15:24 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-09-27 15:24 gitlist [this message]
2011-09-27 16:22 ` "Resetting" a repository Randal L. Schwartz
2011-09-28 7:52 ` Roddie Grant
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=4E81EAA7.5030708@myword.co.uk \
--to=gitlist@myword.co.uk \
--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