Hey guys , i am starter developer and just started using github , so my question is lets say i have created my own branch from “master” and did some staff with BP_Character my work took like 2 days and now i am trying to merge my branch to master , but while i was doing my task other dev also worked on BP_Character and submitted it to master , so what is next? Github will automatically combine my version of BP_Character with the one on master ?
No, you won’t be able to manage the differences that way.
Only one person can check out a blueprint asset at a time.
You’ll have to develop your workflow around this. You can put new behavior into components, for instance, or build new logic meant to go directly into the class on a duplicate. After validation that you will keep the code, you could update main branch and then have everybody sync with it.
Probably best thing to do is to use the “Diff” function in the Blueprint viewer to compare your changes to what’s currently in repo, then re-do your changes after pulling latest.
There is theoretically a Merge functionality in there too, right under Diff, but I’ve never had anything but a massive headache with that.