{"thread":{"id":"24007","subject":"git-svn: local commits going to svn/trunk","startedAt":"2010-06-04T16:16:57Z","lastAt":"2010-06-04T16:16:57Z","messageCount":1,"participants":["Warren Harris"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"142990","messageId":"F2265BC9-B023-46F9-BA72-ECEE62F23F8D@gmail.com","threadId":"24007","inReplyTo":null,"subject":"git-svn: local commits going to svn/trunk","fromName":"Warren Harris","fromEmail":"warrensomebody@gmail.com","sentAt":"2010-06-04T16:16:57Z","receivedAt":"2010-06-04T16:16:57Z","isPatch":false,"sender":{"key":"warrensomebody@gmail.com","avatar":"https://gravatar.com/avatar/7d2eceaae8e9889932b5061446dc6bd2d5ecfbbf2d718c6068c18af881f28e95?d=mp&s=160"},"body":"I seem to have gotten off the beaten path in my usage of git-svn and could use some advice. I routinely use git-svn to land my personal git repo into a shared svn repo (usually doing a 'git svn rebase', 'git svn dcommit')... but apparently forgot to rebase before a commit a few days ago. My dcommit got a merge conflict so I then rebased and dcommitted again. Now, several days and several dcommits later I realize that I've been working on my svn branch (git stat says \"Not currently on any branch.\") and the view in gitx shows:\n\n--A--B--C--D'--E... svn/trunk  (where my checkins seem to be going)\n  \\\n    C--D  master\n\nwhere: \nA is the common root\nB is the svn commit that caused my merge problem, \nC is part of the changes I was trying to land (went cleanly into svn)\nD is the master commit that had the merge conflict,\nD' is the commit I made after fixing the conflict (I didn't realize this was going onto the svn branch, not identical to D)\nE is the beginning of all the checkins I've made after hitting this problem\n\nI believe the steps that got me here were (reconstructing from my history):\n\n-- at D on master\ngit svn dcommit -- forgot to rebase first\n-- merge problem with B\n-- accidentally left on the svn branch?\ngit svn rebase  -- trying again with a rebase first, but maybe I wasn't on master here?\ngit svn dcommit\n-- fixed merge conflicts\ngit commit -- created D' locally\ngit svn dcommit -- pushed D' to svn repo\n-- subsequent checkins to my svn branch instead of master...\n\nAnyway, after realizing this problem last night, I tried to 'git co master', 'git svn rebase' but got massive conflicts. I aborted this, but now I'm wondering how to fix this mess. Maybe 'git co svn/trunk', 'git branch -M master'?... but I don't want to make problems worse.\n\nWarren"}]}