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

git svn rebase totally confused; just need some sorta reset

From
davetron5000 <davetron5000@gmail.com>
Date
Dec 29, 2008, 21:39 UTC
Message-ID
<cd7145c4-a4bb-4ef6-95db-7c4058b6774c@m16g2000vbp.googlegroups.com>

So, my repo is in a weird state. I have committed my changes to svn via git svn dcommit, and it appears that the svn repository has all my changes.

However, git svn rebase fails with conflicts, on almost every single commit I've made. I think that ultimately, I merged a branch in numerous times and git seems confused. BUT, I don't really care about preserving that; I just want my master branch to be clean.

Is there a way I can basically say: commit XXX is the same as the current HEAD of SVN, so treat things as if that's the case. i.e. treat things the same as if I had just done a clean git svn clone.

Next: Jacob Helwig
Message 1 of 3 in “git svn rebase totally confused; just need some sorta reset”
  1. davetron5000Dec 29, 2008
  2. Jacob HelwigDec 29, 2008
  3. Boyd Stephen Smith Jr.Dec 29, 2008

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.