Anyone out there handy with git and can offer some help?<div><br></div><div>I had my application in SVN and did an git svn clone to work on it locally. I branched to work on a feature (f1), then branched again to work on a feature of that feature (f2). Along the way I pushed the local git repo to a git server I set up so that I could work on the code on another computer. I also made some changes along the way in SVN, git svn rebased them to the local git repo, and merged them up into my development branch.</div>
<div><br></div><div>I tried merging f2 into f1 and then f1 into master which gets the correct code into master, but when I try to git svn dcommit to get the changes back SVN, I get</div><div><br></div><div><blockquote class="gmail_quote" style="margin-top: 0px; margin-right: 0px; margin-bottom: 0px; margin-left: 0.8ex; border-left-width: 1px; border-left-color: rgb(204, 204, 204); border-left-style: solid; padding-left: 1ex; ">
Unable to determine upstream SVN information from working tree history</blockquote><div><br></div><div>I got some help on the #git channel and some googling on the multiple possibilities with that error. After some git reset --hard and rebasing f2->f1->master<-git-svn I could svn dcommit (with a few merge conflicts) but I'm still missing some commits. </div>
<div><br></div><div>I'd like to be able to properly merge/rebase whatever I have to so that I can keep the git history inside svn, so I don't want to do a big diff of the git repo and apply it to svn. I'd also like to understand what's going on here because working with git has been fun, but I can't really move to it if I'm blindly merging and committing until I get the results I want.</div>
<div><br></div><div>Thanks</div><div><br></div><div>Sean</div><br>-- <br>Sean Walberg <<a href="mailto:sean@ertw.com">sean@ertw.com</a>> <a href="http://ertw.com/">http://ertw.com/</a><br>
</div>