tag:blogger.com,1999:blog-11485756.post5958539952378753767..comments2023-09-25T12:19:44.716+02:00Comments on Thomas Ferris Nicolaisen's blog: Git+SVN ScreencastsThomas Ferris Nicolaisen http://www.blogger.com/profile/17464665832399025601noreply@blogger.comBlogger4125tag:blogger.com,1999:blog-11485756.post-16118045637815012912011-09-28T22:54:44.589+02:002011-09-28T22:54:44.589+02:00Thanks for the comment! Indeed, working in a branc...Thanks for the comment! Indeed, working in a branch for some time, and then squashing it back is a "rythm" many of my colleagues find very practical when working with git-svn. As long as history ends up linear in the end, you can do what you want :)Thomas Ferris Nicolaisen https://www.blogger.com/profile/17464665832399025601noreply@blogger.comtag:blogger.com,1999:blog-11485756.post-25525896260400729062011-09-28T20:26:35.519+02:002011-09-28T20:26:35.519+02:00You can do merges with git-svn...
git checkout my...You can do merges with git-svn...<br /><br />git checkout mybranch<br />commit changes<br />commit changes<br />git svn dcommit<br />git checkout trunk<br />git merge --squash mybranch<br />git commit -m "Merging mybranch into trunk"<br />git svn dcommit<br /><br /><br />--squash is the keyAnonymousnoreply@blogger.comtag:blogger.com,1999:blog-11485756.post-17601339170279147952010-09-25T23:59:12.413+02:002010-09-25T23:59:12.413+02:00Thanks for the comment, Johannes! I wasn't pla...Thanks for the comment, Johannes! I wasn't planning on going to deep into the field of merging and rebasing, most of all because living with Subversion forces you to basically drop the notion of doing any merges. Also, my rebase/merge understanding isn't totally there yet. I recommend you have a look at <a href="http://streaming.java.no/tcs/?id=8FA1D400-8EB6-4AFC-87A8-748EBD92105C" rel="nofollow">Kristian Rosenvold's "Git-fu!" talk from JavaZone</a>.Thomas Ferris Nicolaisen https://www.blogger.com/profile/17464665832399025601noreply@blogger.comtag:blogger.com,1999:blog-11485756.post-38803887749441480812010-09-25T23:12:12.302+02:002010-09-25T23:12:12.302+02:00Nice videos. I hope to get a better understanding ...Nice videos. I hope to get a better understanding of merging and rebasing as you progress through the videos.<br /><br />BTW: My experience is that once you get used to the syntax, editing merge conflicts manually is usually pretty simple, while merge tools sometimes makes a total mess out of the situation.Johannes Brodwallhttps://www.blogger.com/profile/02363537065542626477noreply@blogger.com