Re: [git-users] git merge -- resolving conflicts?

2016-08-21 Thread Michael
On 2016-08-16, at 5:53 AM, Konstantin Khomoutov wrote: > On Mon, 15 Aug 2016 12:16:46 -0700 > Michael wrote: > > [...] Also: Why "ours" and "theirs"? Which one is which? I'm one person with multiple branches. >>> >>> Well, sure

Re: [git-users] git merge -- resolving conflicts?

2016-08-16 Thread Konstantin Khomoutov
On Mon, 15 Aug 2016 12:16:46 -0700 Michael wrote: [...] > >> Also: Why "ours" and "theirs"? Which one is which? I'm one person > >> with multiple branches. > > > > Well, sure it's a bit philosophical because there are different > > ways to _look_ at what a merge is. To

Re: [git-users] git merge -- resolving conflicts?

2016-08-15 Thread Michael
On 2016-08-15, at 7:16 AM, Konstantin Khomoutov wrote: > On Sat, 13 Aug 2016 18:15:17 -0700 > Michael_google gmail_Gersten wrote: > > [...] After I've done the "git merge" and it has failed, how can I then auto-select on a file

Re: [git-users] git merge -- resolving conflicts?

2016-08-15 Thread Konstantin Khomoutov
On Sat, 13 Aug 2016 18:15:17 -0700 Michael_google gmail_Gersten wrote: [...] > > > After I've done the "git merge" and it has failed, how can I then > > > auto-select on a file by file basis? > > > > I think you want > > > > $ git checkout --ours . > > $ git add -u > >

Re: [git-users] git merge -- resolving conflicts?

2016-08-14 Thread Philip Oakley
From: "Michael_google gmail_Gersten" On Fri, Jul 29, 2016 at 12:02 PM, Konstantin Khomoutov wrote: On Fri, 29 Jul 2016 09:10:06 -0700 Michael wrote: > After doing a "git merge", I wind up with a few conflicts. > > My

Re: [git-users] git merge -- resolving conflicts?

2016-08-13 Thread Michael_google gmail_Gersten
On Fri, Jul 29, 2016 at 12:02 PM, Konstantin Khomoutov wrote: > > On Fri, 29 Jul 2016 09:10:06 -0700 > Michael wrote: > > > After doing a "git merge", I wind up with a few conflicts. > > > > My files have the three states. > > > > I am finding

Re: [git-users] git merge -- resolving conflicts?

2016-07-29 Thread Konstantin Khomoutov
On Fri, 29 Jul 2016 09:10:06 -0700 Michael wrote: > After doing a "git merge", I wind up with a few conflicts. > > My files have the three states. > > I am finding that I almost always want the third state (between === > and >>>) to resolve these conflicts. > > How can I

[git-users] git merge -- resolving conflicts?

2016-07-29 Thread Michael
After doing a "git merge", I wind up with a few conflicts. My files have the three states. I am finding that I almost always want the third state (between === and >>>) to resolve these conflicts. How can I tell merge, AFTER seeing the conflicts, and looking at them, to use the third option