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?
asked Feb 07 '18 at 10:56 AM in Everything Else
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...
answered Feb 07 '18 at 01:42 PM
Follow this question
Once you sign in you will be able to subscribe for any updates here