SynoCommunity/spksrc — comment on commit 23861e01a58553c9d0f484db17ce748d6678c79a
File:  line 0
By Diaoul:

At least I got it now.
What happens:

1 We use the same commit locally (say commit sha1 a)
2a You commit changes now
2b I commit changes
3a You push it works
3b I push it fails. I need to pull before so I'm up to date.

From this point, if I pull, it'll require a merge because we haven't the same history. Even if there is no conflict!
Or I can use `git pull --rebase` and it will pull changes and make my commit on top of your changes.

I can set pull to use rebase instead of merge for this repo in a config file i think