warriorstar-orion
50e0665afa
fix conflict marker creation ( #23165 )
2023-11-05 15:45:38 +00:00
warriorstar-orion
349eca230c
mapmerge: Separate DMM conflicts for distinct atom root types. ( #22609 )
...
* Separate DMM conflicts for distinct atom root types.
* clarify order of operations
2023-11-01 20:37:18 +00:00
warriorstar-orion
8898e3ab6c
mapmerge: one last fix for diff size ( #22746 )
2023-10-06 19:46:50 +01:00
warriorstar-orion
ee2737378b
mapmerge: fix bidict.KeyAndValueDuplicationError ( #22737 )
2023-10-05 22:17:47 -05:00
warriorstar-orion
a0019cfac6
mapmerge: Improve three-way merge output. ( #22362 )
...
* Improve three-way merge output.
Prior to this PR, even if the three way merge found a matching tile
definition from one side of the merge, it would receive a new key. Now
an attempt is made to also preserve the key from that side of the merge
when possible.
* lewc review
2023-09-19 16:53:08 +01:00
warriorstar-orion
274ef027dc
Add required configuration for automated map merge script. ( #19484 )
...
* Update merge_driver script.
* Actually tick and compile new files.
* Improve marker description.
2022-11-05 15:58:35 +00:00
S34N
4f5c3376e3
Updates tools to include mapmerge hooks and merge drivers, plus more ( #18034 )
...
* bumps tools to modern versions, adds DMM merge driver hooks for automatic map merging
* mapping guidelines update
* Update .github/CONTRIBUTING.md
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com >
* aa review
* these somehow got ignored? force adding
* Apply suggestions from code review
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com >
2022-06-21 23:53:19 +01:00
