{"thread":{"id":"33293","subject":"merge help","startedAt":"2013-03-26T22:07:23Z","lastAt":"2013-03-27T14:10:40Z","messageCount":2,"participants":["J.V.","Magnus Bäck"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"212349","messageId":"51521C1B.3080307@gmail.com","threadId":"33293","inReplyTo":null,"subject":"merge help","fromName":"J.V.","fromEmail":"jvsrvcs@gmail.com","sentAt":"2013-03-26T22:07:23Z","receivedAt":"2013-03-26T22:07:23Z","isPatch":false,"sender":{"key":"jvsrvcs@gmail.com","avatar":null},"body":"I have a branch for which I have made 0 (nada) changes.  I did the \nfollowing:\n\n$git pull --rebase --no-stat -v --progress origin mybranch\n\nI get the following\n\nU       java/Profile.java\nPull is not possible because you have unmerged files.\nPlease, fix them up in the work tree, and then use 'git add/rm <file>'\nas appropriate to mark resolution, or use 'git commit -a'.\n----------   (there is no local master branch), because of the conflict \nI was put on (no branch)\n* (no branch)\n   branch1\n   dev\n   tmpWork\n\nQuestion 1)\nWhy did I get a merge conflict if I have not changed any files?\n\n\nQuestion 2)\nWhat is the command to show the difference between the files? (is there \na visual tool that would let me merge)?\n\nQuestion 3)\nWhat is the command I would type to \"accept theirs\" and overwrite my local?\n\nAfter this would I need to $git add & commit & push the file?\n\nIf someone could guide me through this initial process, (what is best \nrecommended it would be most helpful).\n\nthanks\n\nJ.V.\n"},{"id":"212377","messageId":"20130327141039.GA11161@google.com","threadId":"33293","inReplyTo":"51521C1B.3080307@gmail.com","subject":"Re: merge help","fromName":"Magnus Bäck","fromEmail":"baeck@google.com","sentAt":"2013-03-27T14:10:40Z","receivedAt":"2013-03-27T14:10:40Z","isPatch":false,"sender":{"key":"baeck@google.com","avatar":null},"body":"On Tuesday, March 26, 2013 at 18:07 EDT,\n     \"J.V.\" <jvsrvcs@gmail.com> wrote:\n\n> I have a branch for which I have made 0 (nada) changes.  I did the\n> following:\n> \n> $git pull --rebase --no-stat -v --progress origin mybranch\n> \n> I get the following\n> \n> U       java/Profile.java\n> Pull is not possible because you have unmerged files.\n> Please, fix them up in the work tree, and then use 'git add/rm <file>'\n> as appropriate to mark resolution, or use 'git commit -a'.\n> ----------   (there is no local master branch), because of the\n> conflict I was put on (no branch)\n> * (no branch)\n>   branch1\n>   dev\n>   tmpWork\n> \n> Question 1)\n> Why did I get a merge conflict if I have not changed any files?\n\nThe error message indicates that you already had a pending merge\nconflict when you initiated the pull. Why you had that is impossible\nto tell.\n\n> Question 2)\n> What is the command to show the difference between the files? (is\n> there a visual tool that would let me merge)?\n\nYou're looking for this form of \"git diff\":\n\n       git diff [options] <commit> <commit> [--] [<path>...]\n\nExample:\n\n       git diff origin/master HEAD -- file.c file.h\n\nThere are many graphical diff and merge tools that you can configure\nfor use with Git, e.g. kdiff3 and meld. See git-difftool(1) and\ngit-mergetool(1).\n\n[...]\n\n-- \nMagnus Bäck\nbaeck@google.com\n"}]}