[jmeter] branch master updated: Use union merge strategy for changes.xml and changes_history.xml

[vl...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

vladimirsitnikov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jmeter.git


The following commit(s) were added to refs/heads/master by this push:
     new 6f6f2b7  Use union merge strategy for changes.xml and changes_history.xml
6f6f2b7 is described below

commit 6f6f2b7a9968fe3f6cb5ab172f478e6fa1e3c84e
Author: Vladimir Sitnikov <si...@gmail.com>
AuthorDate: Wed Oct 2 16:19:09 2019 +0300

    Use union merge strategy for changes.xml and changes_history.xml
    
    This should avoid "merge conflicts" on changes.xml and changes_history.xml files
---
 .gitattributes | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitattributes b/.gitattributes
index bfd8e48..21d6f9b 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -20,3 +20,5 @@
 /bin/jmeter        text eol=lf executable
 /bin/jmeter-server text eol=lf executable
 /bin/mirror-server text eol=lf executable
+/xdocs/changes.xml merge=union
+/xdocs/changes_history.xml merge=union