{"thread":{"id":"13516","subject":"Confused about recovering from a merge conflict","startedAt":"2008-05-14T15:59:14Z","lastAt":"2008-05-30T13:42:57Z","messageCount":4,"participants":["D. Stuart Freeman","Chris Ortman"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"76949","messageId":"482B0C52.4030206@et.gatech.edu","threadId":"13516","inReplyTo":null,"subject":"Confused about recovering from a merge conflict","fromName":"D. Stuart Freeman","fromEmail":"stuart.freeman@et.gatech.edu","sentAt":"2008-05-14T15:59:14Z","receivedAt":"2008-05-14T15:59:14Z","isPatch":false,"sender":{"key":"stuart.freeman@et.gatech.edu","avatar":"https://gravatar.com/avatar/d2c9483eaa2fa28008c84e68b765886b118c445b1ddf2ad0d0fe7ba814127a9a?d=mp&s=160"},"body":"I've made some local modifications and want to 'git svn dcommit' them so\nI 'git svn rebase' first:\n\n $ git svn rebase\n First, rewinding head to replay your work on top of it...\n HEAD is now at cdef7ac Cleanup of new assignment screens\n Applying Cleanup new assignment screens\n error: tool/src/webapp/content/css/thickbox.css: does not match index\n error: patch failed:\ntool/src/webapp/content/templates/newassignment1.html:6\n error: tool/src/webapp/content/templates/newassignment1.html: patch\ndoes not apply\n Using index info to reconstruct a base tree...\n Falling back to patching base and 3-way merge...\n error: Entry 'tool/src/webapp/content/css/thickbox.css' not uptodate.\nCannot merge.\n fatal: merging of trees aa2dad90c89e9063f2a8002e4b5a11f6b1583955 and\n6535ebaaebf\n fdaadd44a93bc1fc4a66a5ec4dcf4 failed\n Failed to merge in the changes.\n Patch failed at 0001.\n\n When you have resolved this problem run \"git rebase --continue\".\n If you would prefer to skip this patch, instead run \"git rebase --skip\".\n To restore the original branch and stop rebasing run \"git rebase --abort\".\n\n rebase refs/remotes/iteration_5: command returned error: 1\n\nUh-oh, now I appear to be on 'no branch' and the contents of\nthickbox.css aren't marked up with the conflict markers, it appears to\njust be the old file without my revisions. Did I do something wrong?\nHow do I recover from this state?\n\n-- \nD. Stuart Freeman\nGeorgia Institute of Technology\n\n\nbegin:vcard\nfn:D. Stuart Freeman\nn:Freeman;Douglas\nemail;internet:stuart.freeman@et.gatech.edu\ntel;work:(404)385-1473\nx-mozilla-html:FALSE\nversion:2.1\nend:vcard\n\n"},{"id":"78059","messageId":"c0f2d4110805290949m18822c3x15675bed83c7fa5@mail.gmail.com","threadId":"13516","inReplyTo":"482B0C52.4030206@et.gatech.edu","subject":"Re: Confused about recovering from a merge conflict","fromName":"Chris Ortman","fromEmail":"chrisortman@gmail.com","sentAt":"2008-05-29T16:49:14Z","receivedAt":"2008-05-29T16:49:14Z","isPatch":false,"sender":{"key":"chrisortman@gmail.com","avatar":"https://gravatar.com/avatar/eee0ef2ab483c4675dccfb3fa08623592c1bceda0adb93c766f56dfed0a23af8?d=mp&s=160"},"body":"I am also running into this problem.\nAre you running windows+cygwin or git on linux?\nI am on XPSP2 and cygwin\n\nOn Wed, May 14, 2008 at 10:59 AM, D. Stuart Freeman\n wrote:\n> I've made some local modifications and want to 'git svn dcommit' them so\n> I 'git svn rebase' first:\n>\n> $ git svn rebase\n> First, rewinding head to replay your work on top of it...\n> HEAD is now at cdef7ac Cleanup of new assignment screens\n> Applying Cleanup new assignment screens\n> error: tool/src/webapp/content/css/thickbox.css: does not match index\n> error: patch failed:\n> tool/src/webapp/content/templates/newassignment1.html:6\n> error: tool/src/webapp/content/templates/newassignment1.html: patch\n> does not apply\n> Using index info to reconstruct a base tree...\n> Falling back to patching base and 3-way merge...\n> error: Entry 'tool/src/webapp/content/css/thickbox.css' not uptodate.\n> Cannot merge.\n> fatal: merging of trees aa2dad90c89e9063f2a8002e4b5a11f6b1583955 and\n> 6535ebaaebf\n> fdaadd44a93bc1fc4a66a5ec4dcf4 failed\n> Failed to merge in the changes.\n> Patch failed at 0001.\n>\n> When you have resolved this problem run \"git rebase --continue\".\n> If you would prefer to skip this patch, instead run \"git rebase --skip\".\n> To restore the original branch and stop rebasing run \"git rebase --abort\".\n>\n> rebase refs/remotes/iteration_5: command returned error: 1\n>\n> Uh-oh, now I appear to be on 'no branch' and the contents of\n> thickbox.css aren't marked up with the conflict markers, it appears to\n> just be the old file without my revisions. Did I do something wrong?\n> How do I recover from this state?\n>\n> --\n> D. Stuart Freeman\n> Georgia Institute of Technology\n>\n"},{"id":"78083","messageId":"483F0895.6040104@et.gatech.edu","threadId":"13516","inReplyTo":"c0f2d4110805290949m18822c3x15675bed83c7fa5@mail.gmail.com","subject":"Re: Confused about recovering from a merge conflict","fromName":"D. Stuart Freeman","fromEmail":"stuart.freeman@et.gatech.edu","sentAt":"2008-05-29T19:48:37Z","receivedAt":"2008-05-29T19:48:37Z","isPatch":false,"sender":{"key":"stuart.freeman@et.gatech.edu","avatar":"https://gravatar.com/avatar/d2c9483eaa2fa28008c84e68b765886b118c445b1ddf2ad0d0fe7ba814127a9a?d=mp&s=160"},"body":"It was actually my boss that ran into this, he's using msysgit on XP.\nI'm not sure what service pack.\n\nChris Ortman wrote:\n> I am also running into this problem.\n> Are you running windows+cygwin or git on linux?\n> I am on XPSP2 and cygwin\n> \n> On Wed, May 14, 2008 at 10:59 AM, D. Stuart Freeman\n> wrote:\n>> I've made some local modifications and want to 'git svn dcommit' them so\n>> I 'git svn rebase' first:\n>>\n>> $ git svn rebase\n>> First, rewinding head to replay your work on top of it...\n>> HEAD is now at cdef7ac Cleanup of new assignment screens\n>> Applying Cleanup new assignment screens\n>> error: tool/src/webapp/content/css/thickbox.css: does not match index\n>> error: patch failed:\n>> tool/src/webapp/content/templates/newassignment1.html:6\n>> error: tool/src/webapp/content/templates/newassignment1.html: patch\n>> does not apply\n>> Using index info to reconstruct a base tree...\n>> Falling back to patching base and 3-way merge...\n>> error: Entry 'tool/src/webapp/content/css/thickbox.css' not uptodate.\n>> Cannot merge.\n>> fatal: merging of trees aa2dad90c89e9063f2a8002e4b5a11f6b1583955 and\n>> 6535ebaaebf\n>> fdaadd44a93bc1fc4a66a5ec4dcf4 failed\n>> Failed to merge in the changes.\n>> Patch failed at 0001.\n>>\n>> When you have resolved this problem run \"git rebase --continue\".\n>> If you would prefer to skip this patch, instead run \"git rebase --skip\".\n>> To restore the original branch and stop rebasing run \"git rebase --abort\".\n>>\n>> rebase refs/remotes/iteration_5: command returned error: 1\n>>\n>> Uh-oh, now I appear to be on 'no branch' and the contents of\n>> thickbox.css aren't marked up with the conflict markers, it appears to\n>> just be the old file without my revisions. Did I do something wrong?\n>> How do I recover from this state?\n>>\n>> --\n>> D. Stuart Freeman\n>> Georgia Institute of Technology\n>>\n\n\n-- \nD. Stuart Freeman\nGeorgia Institute of Technology\n\n\nbegin:vcard\nfn:D. Stuart Freeman\nn:Freeman;Douglas\nemail;internet:stuart.freeman@et.gatech.edu\ntel;work:(404)385-1473\nx-mozilla-html:FALSE\nversion:2.1\nend:vcard\n\n"},{"id":"78143","messageId":"c0f2d4110805300642re4e66dx7b62de3fd5afd78d@mail.gmail.com","threadId":"13516","inReplyTo":"483F0895.6040104@et.gatech.edu","subject":"Re: Confused about recovering from a merge conflict","fromName":"Chris Ortman","fromEmail":"chrisortman@gmail.com","sentAt":"2008-05-30T13:42:57Z","receivedAt":"2008-05-30T13:42:57Z","isPatch":false,"sender":{"key":"chrisortman@gmail.com","avatar":"https://gravatar.com/avatar/eee0ef2ab483c4675dccfb3fa08623592c1bceda0adb93c766f56dfed0a23af8?d=mp&s=160"},"body":"I wonder if it has to do with windows just sucking at disk access?\nI am getting some other weirdness like dirty index even though nothing\nshows up with git status and after doing a git reset --hard HEAD\n\nOn Thu, May 29, 2008 at 2:48 PM, D. Stuart Freeman\n wrote:\n> It was actually my boss that ran into this, he's using msysgit on XP.\n> I'm not sure what service pack.\n>\n> Chris Ortman wrote:\n>> I am also running into this problem.\n>> Are you running windows+cygwin or git on linux?\n>> I am on XPSP2 and cygwin\n>>\n>> On Wed, May 14, 2008 at 10:59 AM, D. Stuart Freeman\n>> wrote:\n>>> I've made some local modifications and want to 'git svn dcommit' them so\n>>> I 'git svn rebase' first:\n>>>\n>>> $ git svn rebase\n>>> First, rewinding head to replay your work on top of it...\n>>> HEAD is now at cdef7ac Cleanup of new assignment screens\n>>> Applying Cleanup new assignment screens\n>>> error: tool/src/webapp/content/css/thickbox.css: does not match index\n>>> error: patch failed:\n>>> tool/src/webapp/content/templates/newassignment1.html:6\n>>> error: tool/src/webapp/content/templates/newassignment1.html: patch\n>>> does not apply\n>>> Using index info to reconstruct a base tree...\n>>> Falling back to patching base and 3-way merge...\n>>> error: Entry 'tool/src/webapp/content/css/thickbox.css' not uptodate.\n>>> Cannot merge.\n>>> fatal: merging of trees aa2dad90c89e9063f2a8002e4b5a11f6b1583955 and\n>>> 6535ebaaebf\n>>> fdaadd44a93bc1fc4a66a5ec4dcf4 failed\n>>> Failed to merge in the changes.\n>>> Patch failed at 0001.\n>>>\n>>> When you have resolved this problem run \"git rebase --continue\".\n>>> If you would prefer to skip this patch, instead run \"git rebase --skip\".\n>>> To restore the original branch and stop rebasing run \"git rebase --abort\".\n>>>\n>>> rebase refs/remotes/iteration_5: command returned error: 1\n>>>\n>>> Uh-oh, now I appear to be on 'no branch' and the contents of\n>>> thickbox.css aren't marked up with the conflict markers, it appears to\n>>> just be the old file without my revisions. Did I do something wrong?\n>>> How do I recover from this state?\n>>>\n>>> --\n>>> D. Stuart Freeman\n>>> Georgia Institute of Technology\n>>>\n>\n>\n> --\n> D. Stuart Freeman\n> Georgia Institute of Technology\n>\n"}]}