git/list[1] front-page[2] threads[3] people[4] search[5] about
 

"Resetting" a repository

From
Ggitlist <gitlist@myword.co.uk>
Date
Sep 27, 2011, 15:24 UTC
Message-ID
<4E81EAA7.5030708@myword.co.uk>

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: Randal L. Schwartz
Message 1 of 3 in “"Resetting" a repository”
  1. gitlistSep 27, 2011
  2. Randal L. SchwartzSep 27, 2011
  3. Roddie GrantSep 28, 2011

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.