[Mono-dev] Urgent: need more help with Git :(

Stifu stifu at free.fr
Fri Jan 7 14:51:34 EST 2011


I think I messed up. Like, badly.

See this:
https://github.com/mono/mono/commit/22c53124ae437b2e7311f3beabd9de22d83b15db

I don't know what this merge is about (I'm its author), but it looks bad to
me.

Here's exactly what I did: I made 5 minor commits locally, double checked
everything to make sure I don't fuck (reviewing each change, comparing them
with the previous version, etc), then went on and pushed my changes to
master. The 5 commits appear fine (although I didn't expect GitHub to pick
up the date I committed them locally, as opposed to using the push date)...
but there's also this 6th change that looks nasty to me.
For what it's worth, just before pushing, I tried to pull to make sure I was
up to date, and my TortoiseGit crashed at this point. I didn't think much of
it, but now I'm wondering whether this could have a relation with this
merge.

I have no idea what I did, and am really sorry and embarrassed about this. I
very much want to contribute to the Mono project, but I guess I should step
back for now. *sigh*

Can anyone shed some light about what needs to be done? Apart from kicking
my ass.
-- 
View this message in context: http://mono.1490590.n4.nabble.com/Urgent-need-more-help-with-Git-tp3192395p3192395.html
Sent from the Mono - Dev mailing list archive at Nabble.com.


More information about the Mono-devel-list mailing list