Comments on: My git svn workflow http://www.rapaul.com/2010/01/13/my-git-svn-workflow/ A technical blog written by Richard Paul Tue, 07 Feb 2012 02:12:57 +0000 http://wordpress.org/?v=2.9 hourly 1 By: Richard Paul http://www.rapaul.com/2010/01/13/my-git-svn-workflow/comment-page-1/#comment-1021 Richard Paul Sun, 13 Jun 2010 17:14:45 +0000 http://www.rapaul.com/?p=417#comment-1021 @Gergely I'm yet to have a need for merging multiple svn branches so I can't really comment on the situation. But I no longer use Git's merge function. Once I have committed code on my feature branch use Git's rebase feature to resolve any conflicts. e.g. 1) git checkout master 2) git svn rebase (to pick up changes) 3) git checkout mystorybranch (which has already been committed to) 4) git rebase master (this applies my changes on top of the upstream changes) 5) git mergetool (resolve conflicts if they exist, configured to use meld) 6) git add xyz (add the files you have merged) 7) git rebase --continue 8) git svn dcommit 9) git checkout master (read for the next story branch) Steps 5,6,7 are only required if you have conflicts. @Gergely I’m yet to have a need for merging multiple svn branches so I can’t really comment on the situation. But I no longer use Git’s merge function. Once I have committed code on my feature branch use Git’s rebase feature to resolve any conflicts. e.g.
1) git checkout master
2) git svn rebase (to pick up changes)
3) git checkout mystorybranch (which has already been committed to)
4) git rebase master (this applies my changes on top of the upstream changes)
5) git mergetool (resolve conflicts if they exist, configured to use meld)
6) git add xyz (add the files you have merged)
7) git rebase –continue
8) git svn dcommit
9) git checkout master (read for the next story branch)

Steps 5,6,7 are only required if you have conflicts.

]]> By: Gergely Nagy http://www.rapaul.com/2010/01/13/my-git-svn-workflow/comment-page-1/#comment-1018 Gergely Nagy Sat, 12 Jun 2010 20:46:30 +0000 http://www.rapaul.com/?p=417#comment-1018 @Richard, I'm not Nic - but I guess local commits are also useful. BTW, what do ye think about merging 2 svn branches using git? I read somewhere that dcommitting the merge result is not advisable, but not doing so would be pretty limiting - and not sure why is that. Actually, the main reason I got tempted by git-svn is the help out with some complex svn merges.. and it does seem promising so far:) @Richard, I’m not Nic – but I guess local commits are also useful.

BTW, what do ye think about merging 2 svn branches using git? I read somewhere that dcommitting the merge result is not advisable, but not doing so would be pretty limiting – and not sure why is that.
Actually, the main reason I got tempted by git-svn is the help out with some complex svn merges.. and it does seem promising so far:)

]]> By: Richard Paul http://www.rapaul.com/2010/01/13/my-git-svn-workflow/comment-page-1/#comment-584 Richard Paul Thu, 14 Jan 2010 10:59:20 +0000 http://www.rapaul.com/?p=417#comment-584 @Nic Feature/story branches to allow for quick context switching and is the main reason I use Git. What are the benefits you see with Git besides cheap local branching? @Nic Feature/story branches to allow for quick context switching and is the main reason I use Git. What are the benefits you see with Git besides cheap local branching?

]]> By: Nic Wise http://www.rapaul.com/2010/01/13/my-git-svn-workflow/comment-page-1/#comment-583 Nic Wise Thu, 14 Jan 2010 10:22:45 +0000 http://www.rapaul.com/?p=417#comment-583 this is pretty much how I work, except I dont bother doing the feature branch - mostly because I dont need to. At the moment. Maybe I will shortly :) I tend to use GitExtensions on windows. It's msysgit and a nice-ish UI on it. Makes staging files a lot easier for me, tho I end up using the command line for almost eveything else. My workflow is: git init etc - only did this once, took ages. work work work git add etc git commit as needed. repeat more work git svn rebase git svn dcommit I think I dont need the rebase, 'cos it does that with the dcommit, but hey - habit. I also have a patch which makes git svn work a LOT quicker (20secs vrs 2 mins) by dynamically loading the svn libs. Makes working with a very remote server (my svn is in denmark) a lot nicer. :) this is pretty much how I work, except I dont bother doing the feature branch – mostly because I dont need to. At the moment. Maybe I will shortly :)

I tend to use GitExtensions on windows. It’s msysgit and a nice-ish UI on it. Makes staging files a lot easier for me, tho I end up using the command line for almost eveything else.

My workflow is:

git init etc – only did this once, took ages.

work work work
git add etc
git commit as needed. repeat more work

git svn rebase
git svn dcommit

I think I dont need the rebase, ‘cos it does that with the dcommit, but hey – habit.

I also have a patch which makes git svn work a LOT quicker (20secs vrs 2 mins) by dynamically loading the svn libs. Makes working with a very remote server (my svn is in denmark) a lot nicer.

:)

]]>