[closed] 100USD bounty for map conflict resolution tool
Posted: Sat Nov 28, 2020 7:25 am
Said tool in fact already exists at: https://github.com/SpaiR/JTGMerge
Perhaps a better tooling language than java could be used, but it does exist for now.
Someone just needs to in fact make the automation tooling which naturally is not a trivial task.
Requirements:
- Runnable from CLI with no user input outside of initial command (automation friendly)
- Input is map file with git conflict already in it
- GUI interface is preferred but not required
- Output in TGM format
- Change output path via command line flag
- Automatically resolve spurious conflicts (conflicts due to line number changes but otherwise do not conflict in any way, no key conflicts and no placement conflicts)
- Automatically resolve key conflicts
- Ability to pick which trunk you want to resolve the conflict with, controllable via prompt or command line parameter being passed
- Command line flag that causes a different return code and an error message when conflict is not automatically resolvable
- End product licensed under GPL
$50 bonus if it is written in Rust
Contact me on discord gunch#6969 if you want to negotiate or discuss requirements, and you don't have a forum account here.
Perhaps a better tooling language than java could be used, but it does exist for now.
Someone just needs to in fact make the automation tooling which naturally is not a trivial task.
Requirements:
- Runnable from CLI with no user input outside of initial command (automation friendly)
- Input is map file with git conflict already in it
- GUI interface is preferred but not required
- Output in TGM format
- Change output path via command line flag
- Automatically resolve spurious conflicts (conflicts due to line number changes but otherwise do not conflict in any way, no key conflicts and no placement conflicts)
- Automatically resolve key conflicts
- Ability to pick which trunk you want to resolve the conflict with, controllable via prompt or command line parameter being passed
- Command line flag that causes a different return code and an error message when conflict is not automatically resolvable
- End product licensed under GPL
$50 bonus if it is written in Rust
Contact me on discord gunch#6969 if you want to negotiate or discuss requirements, and you don't have a forum account here.