Re: Subversion merge or GIT merge? [was: Re: [VOTE] Merge FOP color branch into trunk]

2011-01-30 Thread Peter Hancock
Would the decision to move from SVN to another VCS be in the hands of the wider ASF community? Discussions about migrating from SVN to GIT are often held on infrastructure-...@apache.org and I imagine it is only a matter of time before this happens across the projects, and with sensible

Subversion merge or GIT merge? [was: Re: [VOTE] Merge FOP color branch into trunk]

2011-01-29 Thread Simon Pepping
I read in the literature that GIT and Mercurial merge would be very much better at resolving possible conflicts than subversion. Today I tested this with the merge of the Temp_Color branch into trunk. In GIT I used the GIT repository at https://github.com/apache/fop. The merge of Temp_Color

Re: Subversion merge or GIT merge? [was: Re: [VOTE] Merge FOP color branch into trunk]

2011-01-29 Thread The Web Maestro
Are you saying you think we should consider: a) moving from SVN to GIT b) using GIT as a timesaver for conflicts? Clay Sent from my iPhone On Jan 29, 2011, at 12:24 PM, Simon Pepping spepp...@leverkruid.eu wrote: I read in the literature that GIT and Mercurial merge would be very much