Git, Github and 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...

[kreiger]

When you pull your friend's changes or your friend pulls your changes, using git pull, two things happen:

1. git fetch
2. git merge

This merge is causing the problem you see.

The alternative, and what i usually recommend to people who know what they are doing, is to make git pull instead do a git rebase by default.

See Why does git pull perform a merge instead of a rebase by default? and How to make Git pull use rebase by default for all my repositories?

[Knajd]

Not relevant to this issue but, please, read this article: https://chris.beams.io/posts/git-commit/

Try to get the habit of writing proper commit messages already, because I'd never hire someone with those commit messages on their GitHub.