CODEWITHSUNDEEP
gitunity-game-engineatlassian-sourcetree
Zach Hebert
Zach Hebert

Reputation: 53

No merge conflicts -> broken game

I'm fairly new to git and I'm having trouble fixing an old mistake. I branched an older commit and made some changes on that branch. Then I tried merging into my develop branch, and there were no merge conflicts. When I go to my game, it is broken. I thought the whole point of git was to prevent issues like this. What should I do?

I have tried this multiple times. With the other times, there sometimes was merge conflicts.

Upvotes: 0

Views: 100

Answers (1)

VonC
VonC

Reputation: 1323803

I thought the whole point of git was to prevent issues like this. What should I do?

The fact there is no merge conflict simply means the part you have fixed was not modified in the develop branch: your merge simply copied your fix over to said branch content.
(For Unity, see "Building and Testing" for Tiny Mode, or "Writing and executing tests in Unity Test Runner" for regular projects, or "Building your Unity game to an Android device for testing ")

What you should do is then put in place a local build process and basic smoke tests in order to check everything is still working, before pushing your develop branch to a remote hosting service, where your game reside.

Upvotes: 2

Related Questions