simple conflict resolution tool

« ditz project page

simultaneous issue ads generate conflicts in most SCMs because the order is undefined (it doesn't matter, but the SCM doesn't know that). a ditz command could resolve the conflict in these cases.

Details

Id: f6b3392f7705f042ca35203fc6edf089842a1ca3
Type: feature
Creation time: 2008-04-06 01:27 GMT
Creator: William Morgan <wmorgan-ditz@...>
References: [1] http://rubyforge.org/pipermail/ditz-talk/2008-April/000006.html
[2] http://rubyforge.org/pipermail/ditz-talk/2008-April/000004.html
Release: unassigned
Component: ditz
Status: closed: won't fix won't fix

Issue log

2008-04-07 04:29 GMT William Morgan <wmorgan-ditz@...> added reference 2
2008-04-07 04:28 GMT William Morgan <wmorgan-ditz@...> closed issue with disposition wontfix
instead, going to do one file per issue, which should automagically take care of all the issues this was going to address.
2008-04-06 01:27 GMT William Morgan <wmorgan-ditz@...> added reference 1
2008-04-06 01:27 GMT William Morgan <wmorgan-ditz@...> created