xbmc/xbmc — comment on commit 121211e15b6918ea3ecd34af1a5699526d2b5162
File:  line 0
By elupus:

The bigest problem is that the merge is the wrong way around. You merged master into your dev branch. That mean you replaces history on github with your dev branch. Ie, my commits from yesterday can not be seen easily anymore (that's why this diff here shows the changes from them).

You must always merge your feature branch, into a prestine copy of master if you are to push anything.

I've said it before... We must find a way to block these types of merges. They are note so bad when there is only a few commits difference, but they are a mess when the base commit is far back and we loose ability to view history for master on github.