After working more than two years with the combination of "git repository" and "h&M documents" I've learned: The only real conflict in the document is the time and the user name. All other conflicts are resolved very easily, often just automatically.
This is what I tried to explain before.
I tried to suggest a feature which makes H&M branching compatible, at least partially.
Now, I give up.
I've created a pre-commit hook in git which removes the attributes. This is working fine.
Option to reduce noise in project xml files
Moderators: Alexander Halser, Tim Green
- Tim Green
- Site Admin
- Posts: 7818
- Joined: Mon Jun 24, 2002 9:11 am
- Location: Bruehl, Germany
- Contact:
Re: Option to reduce noise in project xml files
Hi Lukas,
Please don't give up entirely. We are looking into this and possible solutions to make it less problematic. I just can't say when it might be changed, but we'll let you know. Anyway, thanks for reporting this in such detail.
Please don't give up entirely. We are looking into this and possible solutions to make it less problematic. I just can't say when it might be changed, but we'll let you know. Anyway, thanks for reporting this in such detail.
Regards,
Tim (EC Software Documentation & User Support)
Private support:
Please do not email or PM me with private support requests -- post to the forum directly.
Tim (EC Software Documentation & User Support)
Private support:
Please do not email or PM me with private support requests -- post to the forum directly.