From mboxrd@z Thu Jan 1 00:00:00 1970 From: Rich Pixley Subject: Re: merging confusion and question Date: Wed, 08 Aug 2012 10:50:18 -0700 Message-ID: <5022A6DA.2010702@palm.com> References: <5021B20D.2030702@palm.com> <7v393yupjp.fsf@alter.siamese.dyndns.org> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: "git@vger.kernel.org" To: Junio C Hamano X-From: git-owner@vger.kernel.org Wed Aug 08 19:50:29 2012 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1SzAOq-0001nA-Pe for gcvg-git-2@plane.gmane.org; Wed, 08 Aug 2012 19:50:29 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759021Ab2HHRuX (ORCPT ); Wed, 8 Aug 2012 13:50:23 -0400 Received: from smtp-relay2.palm.com ([64.28.152.243]:11088 "EHLO smtp-relay2.palm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758977Ab2HHRuW (ORCPT ); Wed, 8 Aug 2012 13:50:22 -0400 X-IronPort-AV: E=Sophos;i="4.77,734,1336374000"; d="scan'208";a="15202012" Received: from unknown (HELO ushqusdns4.palm.com) ([148.92.223.164]) by smtp-relay2.palm.com with ESMTP; 08 Aug 2012 10:50:19 -0700 Received: from fuji-land.noir.com ([10.100.2.16]) by ushqusdns4.palm.com (8.14.4/8.14.4) with ESMTP id q78HoIOf014258; Wed, 8 Aug 2012 10:50:18 -0700 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.8; rv:15.0) Gecko/20120731 Thunderbird/15.0 In-Reply-To: <7v393yupjp.fsf@alter.siamese.dyndns.org> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Thank you. I think the work flow here needs some work, but reset --hard gets me running again. That should probably be mentioned in the error message. --rich On 8/7/12 18:43 , Junio C Hamano wrote: > Rich Pixley writes: > >> I'm confused. >> >> What is the intended work flow here? Ie, aside from trashing my >> repository and starting over, what does one do to recover? >> >> rich@cobra> git clone /home/rich/repos/webos webos >> Cloning into 'webos'... >> done. >> rich@cobra> cd webos >> rich@cobra> git remote add central git@github.com:openwebos/webos.git >> rich@cobra> git co master >> Already on 'master' >> rich@cobra> git pull central master >> X11 forwarding request failed on channel 0 >> remote: Counting objects: 22, done. >> remote: Compressing objects: 100% (19/19), done. >> remote: Total 21 (delta 12), reused 11 (delta 2) >> Unpacking objects: 100% (21/21), done. >> From github.com:openwebos/webos >> * branch master -> FETCH_HEAD >> warning: Failed to merge submodule meta-webos (not checked out) >> Auto-merging meta-webos >> CONFLICT (submodule): Merge conflict in meta-webos >> Auto-merging README.md >> Automatic merge failed; fix conflicts and then commit the result. >> rich@cobra> git commit -a > Why isn't there any "fix conflicts and then" step between this line > and the friendly insn message on the previous line? > >> error: unable to index file meta-webos >> fatal: updating files failed >> rich@cobra> git add meta-webos >> error: unable to index file meta-webos >> fatal: updating files failed >> rich@cobra> git rm meta-webos >> meta-webos: needs merge >> rm 'meta-webos' >> fatal: git rm: 'meta-webos': Is a directory >> rich@cobra> git merge meta-webos >> error: 'merge' is not possible because you have unmerged files. >> hint: Fix them up in the work tree, >> hint: and then use 'git add/rm ' as >> hint: appropriate to mark resolution and make a commit, >> hint: or use 'git commit -a'. >> fatal: Exiting because of an unresolved conflict. > If you are not interested in mucking with meta-webos with this > merge, you would resolve meta-webos by taking either your (i.e. the > one that came from /home/rich/repos/webos) version or their > (i.e. the one that came from openwebos/webos.git) version. Go back > to the state before "git pull central master" with "reset --hard", > init and update webos submodule, try the "pull" again and then "git > add webos" to resolve to your version, perhaps?