Update: This fix is now included in git releases 1.7.0.1 and greater – for more info – click here. Update 2: This page incorrectly stated that this patch was included in git 1.7.0.1. It’s not! It’s in the git repository’s “next” branch – which will eventually become the git 1.7.2 series. I’ll update again when [...]
Well – (finally) Subversion 1.5 is out! For the first time svn has built in support for repeated merges without spurious conflicts or manually managing the list of previously merged revisions. This is _fantastic_ news. The basis of the merge tracking feature in 1.5 was svnmerge.py which means that many svn users will already have a [...]
This subject has come up a few times in the last few days – I thought I’d take the opportunity to collect my thoughts from various emails and put them here. Svnmerge.py is a tool which tries to fix the _totally broken_ “svn merge” command. Here’s an example scenario. My repository contains a number of [...]
I managed to find some time to watch this today: Tech Talk: Linus Torvalds on git Git is a distributed SCM system – Linus wrote it in two weeks. It seems like it’s getting some traction among some of the Rails crowd. Mozilla seriously considered adopting it for Mozilla 2 work but the lack of [...]
© thinking in geek. Powered by WordPress using the DePo Clean Theme.