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"

git merge conflicts

ok so im trying to merge, for my first time, two branches into my master but im coming up with conflicts. every time ive tried to resolve these conflicts one branch always deletes the others conflicted files. This is not what i want as both branches have relevant work on them.

i have an anim bp, two branches have changed this, i want both branches changes to exist in my master.

So here's my question: Can i merge two conflicting files without loosing any data?

Product Version: UE 4.17
Tags:
more ▼

asked Feb 07 '18 at 10:56 AM in Everything Else

avatar image

Zingy1914
10 1 6

(comments are locked)
10|2000 characters needed characters left
Viewable by all users

1 answer: sort voted first

Short answer is no, you cannot merge Blueprints

You can only look at differences and solve conflicts by selecting the one that you want to keep. Then you can redo the missing part by looking at the visual diff.

So you should avoid to work on the same part as others in the same time...

more ▼

answered Feb 07 '18 at 01:42 PM

avatar image

SRombauts
1k 20 17 96

avatar image Zingy1914 Feb 07 '18 at 02:33 PM

i figured this might be the case :( thanks for the response.

(comments are locked)
10|2000 characters needed characters left
Viewable by all users
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