From mboxrd@z Thu Jan 1 00:00:00 1970 From: "D. Stuart Freeman" Subject: Re: Confused about recovering from a merge conflict Date: Thu, 29 May 2008 15:48:37 -0400 Message-ID: <483F0895.6040104@et.gatech.edu> References: <482B0C52.4030206@et.gatech.edu> Reply-To: stuart.freeman@et.gatech.edu Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------050100010906060909060102" Cc: git@vger.kernel.org To: Chris Ortman X-From: git-owner@vger.kernel.org Thu May 29 21:49:40 2008 Return-path: Envelope-to: gcvg-git-2@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1K1o7x-0007It-CM for gcvg-git-2@gmane.org; Thu, 29 May 2008 21:49:33 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752211AbYE2Tsl (ORCPT ); Thu, 29 May 2008 15:48:41 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752135AbYE2Tsl (ORCPT ); Thu, 29 May 2008 15:48:41 -0400 Received: from deliverator2.ecc.gatech.edu ([130.207.185.172]:53897 "EHLO deliverator2.ecc.gatech.edu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752045AbYE2Tsk (ORCPT ); Thu, 29 May 2008 15:48:40 -0400 Received: from deliverator2.ecc.gatech.edu (localhost [127.0.0.1]) by localhost (Postfix) with SMTP id ECE6A480147; Thu, 29 May 2008 15:48:39 -0400 (EDT) Received: from mailprx2.gatech.edu (mailprx2.prism.gatech.edu [130.207.171.21]) (using TLSv1 with cipher EDH-RSA-DES-CBC3-SHA (168/168 bits)) (Client CN "smtp.mail.gatech.edu", Issuer "Equifax" (verified OK)) by deliverator2.ecc.gatech.edu (Postfix) with ESMTP id 75BFB480070; Thu, 29 May 2008 15:48:38 -0400 (EDT) Received: from [130.207.46.56] (cetel-004-xx6.admin.gatech.edu [130.207.46.56]) (using TLSv1 with cipher RC4-MD5 (128/128 bits)) (No client certificate requested) (sasl: method=PLAIN, username=dfreeman31@mailprx2.gatech.edu, sender=n/a) by mailprx2.gatech.edu (Postfix) with ESMTP id 0F96E1F00; Thu, 29 May 2008 15:48:38 -0400 (EDT) (envelope-from stuart.freeman@et.gatech.edu) User-Agent: Mozilla-Thunderbird 2.0.0.9 (X11/20080110) In-Reply-To: X-Enigmail-Version: 0.95.0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: This is a multi-part message in MIME format. --------------050100010906060909060102 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit It was actually my boss that ran into this, he's using msysgit on XP. I'm not sure what service pack. Chris Ortman wrote: > I am also running into this problem. > Are you running windows+cygwin or git on linux? > I am on XPSP2 and cygwin > > On Wed, May 14, 2008 at 10:59 AM, D. Stuart Freeman > wrote: >> I've made some local modifications and want to 'git svn dcommit' them so >> I 'git svn rebase' first: >> >> $ git svn rebase >> First, rewinding head to replay your work on top of it... >> HEAD is now at cdef7ac Cleanup of new assignment screens >> Applying Cleanup new assignment screens >> error: tool/src/webapp/content/css/thickbox.css: does not match index >> error: patch failed: >> tool/src/webapp/content/templates/newassignment1.html:6 >> error: tool/src/webapp/content/templates/newassignment1.html: patch >> does not apply >> Using index info to reconstruct a base tree... >> Falling back to patching base and 3-way merge... >> error: Entry 'tool/src/webapp/content/css/thickbox.css' not uptodate. >> Cannot merge. >> fatal: merging of trees aa2dad90c89e9063f2a8002e4b5a11f6b1583955 and >> 6535ebaaebf >> fdaadd44a93bc1fc4a66a5ec4dcf4 failed >> Failed to merge in the changes. >> Patch failed at 0001. >> >> When you have resolved this problem run "git rebase --continue". >> If you would prefer to skip this patch, instead run "git rebase --skip". >> To restore the original branch and stop rebasing run "git rebase --abort". >> >> rebase refs/remotes/iteration_5: command returned error: 1 >> >> Uh-oh, now I appear to be on 'no branch' and the contents of >> thickbox.css aren't marked up with the conflict markers, it appears to >> just be the old file without my revisions. Did I do something wrong? >> How do I recover from this state? >> >> -- >> D. Stuart Freeman >> Georgia Institute of Technology >> -- D. Stuart Freeman Georgia Institute of Technology --------------050100010906060909060102 Content-Type: text/x-vcard; charset=utf-8; name="stuart_freeman.vcf" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="stuart_freeman.vcf" begin:vcard fn:D. Stuart Freeman n:Freeman;Douglas email;internet:stuart.freeman@et.gatech.edu tel;work:(404)385-1473 x-mozilla-html:FALSE version:2.1 end:vcard --------------050100010906060909060102--