https://github.com/xwiki/xwiki-commons
Revision f8d5a41cbb9e2da946f7180e757b3f7b62db6226 authored by Simon Urli on 09 August 2019, 14:42:31 UTC, committed by Simon Urli on 09 August 2019, 14:48:52 UTC
  * Use an appropriate Chunk#isOverlappingWith method to check during
the merge if two changes are conflicting
1 parent 34f1f1b
History
Tip revision: f8d5a41cbb9e2da946f7180e757b3f7b62db6226 authored by Simon Urli on 09 August 2019, 14:42:31 UTC
XCOMMONS-1701: merge: conflicts are not always reported in case of change and insert in current and next
Tip revision: f8d5a41
File Mode Size
xwiki-commons-core
xwiki-commons-pom
xwiki-commons-tools
.gitattributes -rw-r--r-- 155 bytes
.gitignore -rw-r--r-- 392 bytes
Jenkinsfile -rw-r--r-- 3.8 KB
LICENSE -rw-r--r-- 25.8 KB
README.md -rw-r--r-- 1.7 KB
build.gradle -rw-r--r-- 1.7 KB
pom.xml -rw-r--r-- 104.6 KB
settings.gradle -rw-r--r-- 2.0 KB

README.md

back to top