I created this because I was having a hard time rebasing my blueprint files and Epic provides a nice tool to diff blueprint files in the editor but there is no support for git in the editor. The use case I am programming for is when you are mid rebase and have to merge two blueprint files.
-
git clone https://github.com/ruba1987/UDiff.git -
Add C:\the\repo\dir\bin to your PATH
git udiff - This command creates new files for you to diff in the editor git umerge - This command will tell UDiff that you are all done fixing the files and you are ready to finalize them
So you are mid rebase and git is telling you that you have a conflict.
From the root of your project run: git udiff
This will create some new files that you can then diff in the editor. Make the changes you want in the editor using the built in diff tools and then save them.
From the root of your project run: git umerge
This will ask you some questions about what you just did and save some new files over the original(s). It will then cleanup after itself. At this point, if you would like, you can validate that the original blueprints have been updated by viewing them in the editor.
Once you are happy simply continue with the rebase as normal.
A simple git pull will update you to the latest.
If you are having trouble just rebuild the .sln in whatever version of VS that you have and that should resolve most issues. I haven't tried this on any other versions of .net (it's currently build for .net 4.5) but I would imagine it will work with 4.0. Eventually I will deploy this for other versions of .net and setup a better build process.