On 26.04.2011 20:14, Julien Rioux wrote:
On 26/04/2011 4:59 AM, Vincent van Ravesteijn wrote:
It would be possible to use svn/git together for one release cycle. I've
been maintaining a git repo parallel to the svn repo for the last few months.
However, everyone needs to become used to using git, we need to decide on
a place to host the git repo, the maintainer needs to design a appropriate
workflow that we all agree on.
I don't feel the need to move to git. At all.
If you think of moving to git because of branch management, I would
strongly caution against that. Branches are too much burden. You want to
avoid them at all costs. The simple fact that git encourage them makes
me want not to approach it.
The reason I feel this way is that merge conflicts happen, they are bad,
and it does not matter what system you use for versioning, you will
spend extra time to resolve them. The earlier you realize you have a
merge conflict, the easier it is to fix. But with branches and the git
philosophy, it seems totally reasonable to work on your own for months,
until your feature is ready to merge, and then it's one more month to
get it in. I have seen this happen, I am not making this up.
Yes, all time spend for merging is lost time. It even stops at some point
the development because all the nice things are done only merging will be left.
And one additional advantage of working on one branch is the ability to
"communicate" over this channel, everyone could jump in without switching
the branch.
Opinions ?
My opinion is that the best way to use git would be very short-lived
branches. I wouldn't mind doing it this way: "Hey guys, here's a pull
request that fixes bug #1234, can you try it out and push it in?"
In other words, the same as "Hey guys, here's a patch that fixes bug
#1234, can you try it out and commit it?"
This way branches are perfect.
All the git infrastructure helps in this. Some clicks and you have your
own clone on githup, gitorious, ...
So svn is just fine.
Git has the advantage of faster server access, and more important you have
the complete history on you local hard disk.
So I would switch to git but use the old 'trunk'-development model.
Having the superb branch support of git laying-around we will see how
it could help us developing.
Peter
