x

Search in
Sort by:

Question Status:

Search help

  • Simple searches use one or more words. Separate the words with spaces (cat dog) to search cat,dog or both. Separate the words with plus signs (cat +dog) to search for items that may contain cat but must contain dog.
  • You can further refine your search on the search results page, where you can search by keywords, author, topic. These can be combined with each other. Examples
    • cat dog --matches anything with cat,dog or both
    • cat +dog --searches for cat +dog where dog is a mandatory term
    • cat -dog -- searches for cat excluding any result containing dog
    • [cats] —will restrict your search to results with topic named "cats"
    • [cats] [dogs] —will restrict your search to results with both topics, "cats", and "dogs"

How to use git merge with Blueprints

I'm trying to test out how to use Git merge capabilities with blueprints. As I understood, this should be supported (in beta though) from UE 4.8.

But if I try to modify a blueprint on two different branches, then merge (I end up with a conflict) and open UE to use the bluprint diff tool, there is no "merge" option on the right click context menu for that blueprint. I can get history, but I can even diff agains previous version. I just get en "Content not supported" error.

Does anyone know how to work with Git and blueprints at the moment?

Thanks.

ps. I'm using Git 2.5.3. Maybe a specific version of Git is required?

Product Version: UE 4.9
Tags:
more ▼

asked Oct 04 '15 at 10:50 AM in Using UE4

avatar image

lagrange
1 2 3 4

(comments are locked)
10|2000 characters needed characters left

1 answer: sort voted first

I'm not really sue how to do it, but given the nature of blueprint files I wouldn't have thought it would be a good idea to merge them. For code files, it's easy enough as it's very easy to see what's changes, what you want to keep and what the resultant file would be, but I doubt that's the case with blueprints.

I'd bet you could force it through the git command line or through a gui tool like SourceTree if you really want, but actually successfully merging the files would probably be tricky.

Presumably one of the blueprint files is the one you actually want, in which case you don't need to merge the two files, you just need to resolve the branch integration and choose to accept one version or the other as the authority.

more ▼

answered Oct 04 '15 at 12:50 PM

avatar image

phil_me_up
1.2k 4 6 12

avatar image lagrange Oct 04 '15 at 01:00 PM

I agree. Text merge on the blueprint files is a no-go. That's why (I've read on the forum) you should do the merge in git (keep it unresolved), start up UE 4.9 and do you blueprint diff in there. As I understand, there's both a Diff and Merge tool built in to the Git UE4 beta plugin. I've used the diff tool before, and it actually work quite nice. You have a visual presentation of the differences between blueprints. If that is possible, it should be possible to merge them, and create a new binary version.

I just can't get it to work... Maybe after upgrading Git or upgrading to UE 4.9.1.

(comments are locked)
10|2000 characters needed characters left
Your answer
toggle preview:

Up to 5 attachments (including images) can be used with a maximum of 5.2 MB each and 5.2 MB total.

Follow this question

Once you sign in you will be able to subscribe for any updates here

Answers to this question