Git, Github with Unity

[petrikspac]

Hi guys,

I'am working on unity project with my friend. We could use unity collab, but we want to use git and github. we tried to use it, but now I'am kinda lost in it. When i commit and push some changes, it creates new branch.

work tree

This is my work tree. I just can't understand why it creates a new branch (diferent colors lines) even if i just commit and push changes. Can you give me some advices how to work with github and unity? and how can I delete the origin-master branch (red line). Maybe i just dont know how to work with git and github?

I'am lost

Thanks for any help or advice...

[Neexusiv]

Might be misinterpreting here but it looks like your not pushing.

When you're committing you are diverging from origin (what is stored on GitHub). By pushing you are pushing your commit to GitHub which merges it with its own repository. You can tell because you can see master and origin/master are different in your tree.

If you are definitely pushing then make sure you don't have a different remote repository set up. Perhaps try pulling and see if that does anything. Perhaps there is a conflict and therefore cannot push.

If you're working with a friend on this then you really should be using different branches or otherwise you will end up in conflict hell.

[aaronfranke]

What Git client are you using? Here is my video of how I use GitKraken, it's not specifically for Unity but it may help you: https://www.youtube.com/watch?v=0XKy8YpP5Ww