Very cool.
I'd just create a second clone of wix repo and try adding entries to the top
then merging. We always add entries to the top... You can also look through the
history of the file. The wix3/develop branch has a number of entries made.
_______________________________________________________________
FireGiant | Dedicated support for the WiX toolset |
http://www.firegiant.com/
From: Sean Farrow [mailto:sean.far...@seanfarrow.co.uk]
Sent: Thursday, April 24, 2014 11:03 AM
To: WiX toolset developer mailing list
Subject: Re: [WiX-devs] Git-fu: custom merge driver for History.md?
Hi Rob,
I've done something similar in the past.
Give me a couple of days and I'll have a look at this.
Can I get old history.md files from anywhere to test with?
Cheers
Sean.
From: Rob Mensching [mailto:r...@firegiant.com]
Sent: 24 April 2014 17:58
To: WiX toolset developer mailing list
Subject: [WiX-devs] Git-fu: custom merge driver for History.md?
Anyone out there a Git-master or know a Git-master? I found an interesting
feature in Git that allows one to write a custom merge driver:
https://www.kernel.org/pub/software/scm/git/docs/gitattributes.html#_defining_a_custom_merge_driver
I was thinking if someone knew enough about writing such things (maybe need
bash scripting skills?), it would be awesome if we could get a custom merge
driver for History.md.
The goal is simple. Union the other branches changes to History.md on top of
the current branches version of History.md. The goal is that new adds always
end up on top.
History.md is (as you'd expect) the prime source of conflicts for us. Having
something like this (or coming up with a mechanism that gives us the same
benefits without the down) would *significantly* reduce the number of conflicts.
I would be greatly appreciative if anyone knew how to solve this.
_______________________________________________________________
FireGiant | Dedicated support for the WiX toolset |
http://www.firegiant.com/
------------------------------------------------------------------------------
Start Your Social Network Today - Download eXo Platform
Build your Enterprise Intranet with eXo Platform Software
Java Based Open Source Intranet - Social, Extensible, Cloud Ready
Get Started Now And Turn Your Intranet Into A Collaboration Platform
http://p.sf.net/sfu/ExoPlatform
_______________________________________________
WiX-devs mailing list
WiX-devs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/wix-devs
