How do you handle this?
Doing a git merge on a d2w rule file resulting in merge conflict. There is now
way to be able to fix this manually as the order of the rules in the d2w model
file changes from one save to the other. A git merge will most likely change
lots of rule fragments. Now having a
that can be really hard, but since we’ve started using the one-line-item file
format, which you may have to turn on? I’ve had a lot less trouble with
conflicts there.
my strategy? build it back by hand…
maybe others have better thoughts on it.
On Nov 21, 2013, at 11:39 AM, Markus Ruggiero wr
