[katello-devel] Could not pull katello.git

[Miroslav Suchy]

My last commit from Friday in katello.git is
  9c4cba5
and if I do git pull I get conflicts.

The fact that Eric changed history in our katello.git and did not 
provide fast forward way from last state to current origin/master means 
that we all have to do
   git reset --hard origin/HEAD

While we can do it, automatic tools around internet could not do it.
I'm aware of only one case:
   http://www.ohloh.net/p/katello
This stopped working and we need to contact ohloh team and tell them 
that they have to manually run the command above for katello.git.
Eric, can you please do that?

Ahh and second one.
http://lzap.fedorapeople.org/stats/katello/index.html
Lukasi, you need to do that as well.

Thanks.

Mirek