Difference and Merge QLC+ Project Files
This utility has been created to assist when two or more persons are working in conjunction but separately on a QLC+ project. The end goal is a tool that can be used to merge two files that began as the same file but have diverged due to concurrent work on different computers.
Initial publication of this tool provides a basic command line interface to compare two files, receiving a report of all differences and where they fully diverge from each other (their "fork" point).
TODO:
- Auto-merge all new Function entries
- Graphical side-by-side differencing and manual merging view
There is no installation, just copy the output files to a directory.
QLCMerge.exe {left-file-path} {right-file-path}
- Fork it!
- Create your feature branch: git checkout -b my-new-feature
- Commit your changes: git commit -am 'Add some feature'
- Push to the branch: git push origin my-new-feature
- Submit a pull request :D
- v0.1.0 (2023-04-01) - Initial publish to GitHub, provides simple console-based differencing only (not an April Fools joke! :D )
Lead Developer - Ross Hammer
The MIT License (MIT)
Copyright (c) 2023 Ross Hammer
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.