Re: Help, git merge corrupted my d2w rule file
Re: Help, git merge corrupted my d2w rule file
- Subject: Re: Help, git merge corrupted my d2w rule file
- From: Jesse Tayler <email@hidden>
- Date: Thu, 21 Nov 2013 12:00:08 -0500
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 <email@hidden> wrote:
> 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@hidden)
> Help/Unsubscribe/Update your Subscription:
>
> This email sent to email@hidden
_______________________________________________
Do not post admin requests to the list. They will be ignored.
Webobjects-dev mailing list (email@hidden)
Help/Unsubscribe/Update your Subscription:
This email sent to email@hidden