{"thread":{"id":"36739","subject":"git svn dcommit error 1","startedAt":"2014-05-23T16:09:42Z","lastAt":"2014-05-23T16:09:42Z","messageCount":1,"participants":["Kendall Shaw"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"242577","messageId":"537F72C6.3060001@kendallshaw.com","threadId":"36739","inReplyTo":null,"subject":"git svn dcommit error 1","fromName":"Kendall Shaw","fromEmail":"kshaw@kendallshaw.com","sentAt":"2014-05-23T16:09:42Z","receivedAt":"2014-05-23T16:09:42Z","isPatch":false,"sender":{"key":"kshaw@kendallshaw.com","avatar":null},"body":"I have made a couple of commits. Then:\n\ngit svn rebase\n\nFor each of my modified files it says they need to be updated. This is \nprobably wrong, but I decided it meant that I should commit. So:\n\ngit add ...\ngit commit ...\ngit svn dcommit\n\nThe dcommit reports error 1. I see that subversion was not updated.\n\nI read an article about using git reset and then continuing from before \nthe error. But, I made a couple of commits. So, what does this mean? Do \nI save off copies of the different commits and reapply them manually \nafter resetting?\n\nWhat should I do at this point?\n\nKendall\n"}]}