Spatial Galaxy

• • Home

• Sites of Interest

  • GeoApt
  • Quantum GIS

• Polls

  What's keeping you from completely migrating to Open Source GIS on the desktop?

  • Quality of editing tools
  • Inadequate map composition
  • Lack of analysis tools
  • No support for my favorite GIS data store
  • Support issues
  • Quality of data management tools
  • Other (please add a comment)

  View Results

   Loading ...
  • Polls Archive

• Recent Comments

  • Chloe Farabee on Brittle Systems
  • GIS-Lab Blog» Архив блога » Новости вокруг 52 on Speculations on the File Geodatabase API
  • Mateusz Loskot on Git Merge – No Problem
  • Kay on Sherman’s Law
  • Gary Sherman on Sherman’s Law

• Categories

  Select Category CMake  (1) ESRI  (4) GDAL/OGR  (2) GIS in General  (11) GMT  (1) GRASS  (1) MapServer  (1) Off topic  (3) Open Source  (34) Platforms  (6) PostGIS  (2) PostgreSQL  (2) Python  (1) Quantum GIS  (8) Site  (1) Ubuntu  (2) uDig  (1) Vim  (1) Web Mapping  (3) Windows  (2)

• Desktop GIS Book

  

• Recent Posts

  • Sherman’s Law
  • Git Merge – No Problem
  • Google Summer of Code 2010 – Quantum GIS
  • Vim and CMake Out-of-Source Builds
  • Speculations on the File Geodatabase API

• Search for:

• Tags

  CMake ESRI fgdb gdal git linux Open Source os x qgis shapefile svn unix Vim

• Archives

  Select Month April 2010  (3) March 2010  (3) January 2010  (3) November 2009  (1) August 2009  (1) April 2009  (1) February 2009  (2) October 2008  (3) September 2008  (1) May 2008  (1) April 2008  (1) March 2008  (1) February 2008  (2) January 2008  (1) November 2007  (2) October 2007  (2) September 2007  (2) May 2007  (2) April 2007  (2) February 2007  (2) January 2007  (1) December 2006  (2) October 2006  (1) September 2006  (1) August 2006  (2) July 2006  (1) April 2006  (1) March 2006  (1) February 2006  (5) January 2006  (1) December 2005  (1) November 2005  (1)

Git Merge – No Problem

Using Git with Subversion makes adding new features easy. Here are the metrics for my latest QGIS hack:

• SVN revisions by others while working on my branch: 177
• Time to complete merge with latest SVN revision: 1 second
• Conflicts: None

Coincidence? Maybe not.

This entry was posted on 04/04/2010 (Sunday) at 6:13 pm and is filed under Quantum GIS. You can follow any responses to this entry through the RSS 2.0 feed. You can leave a response, or trackback from your own site.

Printed from: http://spatialgalaxy.net/2010/04/04/git-merge-no-problem/ .
© Gary Sherman 2010.

1 Comment   »

• Mateusz Loskot says:

  15.04.10 at 06:21

  Yes, indeed. Git is extremely helpful here.

  FYI, I keep Git repository hosted on Gitorious sync’ed with GDAL SVN trunk

  http://gitorious.org/gdal

RSS feed for comments on this post , TrackBack URI