> (*) Is there any good way to get a git merge across ChangeLogs to > "autoresolve"? Often the various ChangeLog files are the only merge > conflicts I need to resolve (although in this case there were some > Makefile.am and of course the readelf/dwarfstrings split to take care > of).
There is a merge helper that I use for that and it works very well. I will have to go look at another machine to find the config details. But you can poke around for "git-merge-changelog" and find it on the web. IIRC it was written by Jim Meyering <[email protected]> (aka [email protected]) so you could also ask him. Thanks, Roland _______________________________________________ elfutils-devel mailing list [email protected] https://fedorahosted.org/mailman/listinfo/elfutils-devel
