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
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
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
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
> >
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
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
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
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