I’m using git lfs as source control and and trying to use the git plugin to handle assets but while the blueprint diff works I can’t seem to find any means to either lock or merge blueprint files. Does this functionality exist and if so could someone help me figure out what I’m doing wrong.
- With the current version of the integrated plugin (v1.x) you can not use Git LFS 2.x File Locks
- I also develop a v2.x “Git (dev)” of the plugin on my own Github repository, that is partially working with Git LFS (but will still need at least a few days, to be usable, and weeks or months to be polished)
- Regarding merging, I don’t know if it works with LFS. Solving a merge conflict works on “normal git” usage.
## Solve a merge conflict:
- When you “merge” two branches (not with a rebase, shame on me!) where a BP was modified on both branches, git mark binary files as in conflict
- The Editor shows a special “!” icon
- Click to open the UE Merge tool, that will display diffs (read-only)
- Choose the side you want to keep (one side will crash the editor, there was an recent question about it) (issue #46)
Hi, thanks for the answer,
when I’ve pulled and there is a BP in conflict the editor does not even show the asset in question let alone the “!” icon.
I only see the source control diff against repo if I’ve changed the BP locally and want to see how I’ve changed it against the source version.
Yes, exactly what I was saying: “pull --rebase” is breaking the plugin 
I hope to work on this following my work on Git LFS 2
Ahh sorry, I’ll keep an eye on your plugin then 