Richard Hartmann, 15.11.2008: > > Note that if you use any unofficial patches, you ought to set the > > "modified by" line accordingly. On Linux, this can be done by setting > > the following (in bash) or similar: > > > > export CONF_ARGS='--with-modified-by="Bill McCarthy (float)"' > > [...] > > PS: Is it possible to make git accept the fact that a changed > line in five branches should be put below each other in random > order. That way, all patches could concat CONF_ARGS for > all patch branches seperately and the end result would be a > complete patch list. Markus, can such a thing be done?
I don't think so, I think there is no way to avoid a conflict. However if you solve it once, it doesn't occur the next time you merge from these branches, only when you merge a new branch. The master branch has already set --with-modified-by to "Vim extended", but there is also a #define MODIFIED_BY in feature.h. What is the difference between these two? Is this for configurations not using configure and should be set, too? But I don't plan on adding modified-by for each patch branch. I don't want people using the git repository be plagued by avoidable merge conflicts which keeps them off using it. Markus --~--~---------~--~----~------------~-------~--~----~ You received this message from the "vim_use" maillist. For more information, visit http://www.vim.org/maillist.php -~----------~----~----~----~------~----~------~--~---
