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

[Rolf Bjarne Kvinge]

Hi,

 

When pulling new remote changes you can do "git pull -rebase" which will
avoid the (scary, but completely harmless) merge commit git added for you (I
don't know how to do that with TortoiseGit, but I assume there is a way)

 

Rolf

 

From: mono-devel-list-bounces at lists.ximian.com
[mailto:mono-devel-list-bounces at lists.ximian.com] On Behalf Of Stifu
Sent: viernes, 07 de enero de 2011 20:52
To: mono-devel-list at lists.ximian.com
Subject: [Mono-dev] Urgent: need more help with Git :(

 

 

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-tp3192395p
3192395.html>
http://mono.1490590.n4.nabble.com/Urgent-need-more-help-with-Git-tp3192395p3
192395.html
Sent from the Mono - Dev mailing list archive at Nabble.com.
_______________________________________________
Mono-devel-list mailing list
 <mailto:Mono-devel-list at lists.ximian.com> Mono-devel-list at lists.ximian.com
 <http://lists.ximian.com/mailman/listinfo/mono-devel-list>
http://lists.ximian.com/mailman/listinfo/mono-devel-list 

  _____  

No virus found in this message.
Checked by AVG - www.avg.com
Version: 10.0.1191 / Virus Database: 1435/3365 - Release Date: 01/07/11

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.ximian.com/pipermail/mono-devel-list/attachments/20110108/88f1ee16/attachment-0001.html