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 merge conflict I get those <<<< ==== >>>> markers. But how can I fix things and decide which version to keep?
What is your strategy? ---markus--- PS I could fix my particular file with the help of the associated .txt file and manually fix up all the rules from the intermediate commits. This cannot be the answer, or can it? _______________________________________________ Do not post admin requests to the list. They will be ignored. Webobjects-dev mailing list ([email protected]) Help/Unsubscribe/Update your Subscription: https://lists.apple.com/mailman/options/webobjects-dev/archive%40mail-archive.com This email sent to [email protected]
