cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Linux versions of PsiOmegaDelta's git_merge_installer scripts

Browse Source
This commit is contained in:
GinjaNinja32
2015-02-04 10:12:11 +00:00
parent 0673c9179b
commit f4435503cc
4 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tools/dmitool/git_merge_installer.sh Executable file
View File

@@ -0,0 +1,6 @@
F="../../.git/config"
echo '' >> $F
echo '[merge "merge-dmi"]' >> $F
echo ' name = iconfile merge driver' >> $F
echo ' driver = ./tools/dmitool/dmimerge.sh %O %A %B' >> $F

4
tools/dmitool/merging.txt
View File

@@ -8,7 +8,7 @@ The easiest way to do merging is to install the merge driver. For this, open `Ba
name = iconfile merge driver
driver = ./tools/dmitool/dmimerge.sh %O %A %B
You may optionally instead run git_merge_installer.bat which should automatically insert these lines for you at the appropriate location.
You may optionally instead run git_merge_installer.bat or git_merge_installer.sh which should automatically insert these lines for you at the appropriate location.
After this, merging DMI files should happen automagically unless there are conflicts (an icon_state that both you and someone else changed).
If there are conflicts, you will unfortunately still be stuck with opening both versions in the editor, and manually resolving the issues with those states.
If there are conflicts, you will unfortunately still be stuck with opening both versions in the editor, and manually resolving the issues with those states.

6
tools/mapmerge/git_merge_installer.sh Executable file
View File

@@ -0,0 +1,6 @@
F="../../.git/config"
echo '' >> $F
echo '[merge "merge-dmm"]' >> $F
echo ' name = mapmerge driver' >> $F
echo ' driver = ./tools/mapmerge/mapmerge.sh %O %A %B' >> $F

2
tools/mapmerge/install.txt
View File

@@ -14,6 +14,6 @@ The easiest way to do merging is to install the merge driver. For this, open `Ba
name = mapmerge driver
driver = ./tools/mapmerge/mapmerge.sh %O %A %B
You may optionally instead run git_merge_installer.bat which should automatically insert these lines for you at the appropriate location.
You may optionally instead run git_merge_installer.bat or git_merge_installer.sh which should automatically insert these lines for you at the appropriate location.
After this, merging maps should happen automagically unless there are conflicts(a tile that both you and someone else changed). If there are conflicts, you will unfortunately still be stuck with opening both versions in a map editor, and manually resolving the issues.