From: Pratyush Yadav <me@yadavpratyush.com>
To: Philip Oakley <philipoakley@iee.email>
Cc: Bert Wesarg <bert.wesarg@googlemail.com>,
Git Mailing List <git@vger.kernel.org>
Subject: Re: [PATCH 2/2] git-gui: support for diff3 conflict style
Date: Fri, 4 Oct 2019 02:24:07 +0530 [thread overview]
Message-ID: <20191003205407.uaguw7qyabfy3aym@yadavpratyush.com> (raw)
In-Reply-To: <dc210bf0-eef3-ed58-f596-0999fd9d9a98@iee.email>
On 03/10/19 09:02PM, Philip Oakley wrote:
> On 30/09/2019 13:17, Bert Wesarg wrote:
> > Pratyush,
> >
> > On Sun, Sep 29, 2019 at 5:04 PM Pratyush Yadav <me@yadavpratyush.com> wrote:
> > > Hi Philip, Bert,
> > >
> > > Is there any way I can test this change? Philip, I ran the rebase you
> > > mention in the GitHub issue [0], and I get that '9c8cba6862abe5ac821' is
> > > an unknown revision.
> > >
> > > Is there any quick way I can reproduce this (maybe on a sample repo)?
> > The easiest way to produce a merge conflict, is to change the same
> > line differently in two branches and try to merge them. I added a
> > fast-import file to demonstrate this for you.
> >
> > $ git init foo
> > $ cd foo
> > $ git fast-import <../conflict-merge.fi
> > $ git reset --hard master
> > $ git merge branch
> >
> > this gets you into the conflict, probably the usual style. Which looks
> > in liek this on the terminal:
> >
> > @@@ -2,7 -2,7 +2,11 @@@ Lorem ipsum dolor sit amet, consectetu
> > Sed feugiat nisl eget efficitur ultrices.
> > Nunc cursus metus rutrum, mollis lorem vitae, hendrerit mi.
> > Aenean vestibulum ante ac libero venenatis, non hendrerit orci pharetra.
> > ++<<<<<<< HEAD
> > +Proin bibendum purus ut est tristique, non pharetra dui consectetur.
> > ++=======
> > + Proin placerat leo malesuada lacinia lobortis.
> > ++>>>>>>> branch
> > Pellentesque aliquam libero et nisi scelerisque commodo.
> > Quisque id velit sed magna molestie porttitor.
> > Vivamus sed urna in risus molestie ultricies.
> >
> > and this in git gui: https://kgab.selfhost.eu/s/gHHaQqowGp7mXEb
>
> The snapshot of the Gui looks just the thing! (I've been away).
>
> I'm sure this would solve my immediate issue.
>
> My only remaining bikeshed question it prompted was to check which parts
> would be committed as part of committing the whole "hunk". But haven't had
> time to look at all!
I'm not sure what you mean by "committing the whole hunk". In a merge
conflict state, you don't get the usual "Stage hunk" and "Stage lines"
options, but instead get 3 options:
Use Remote Version
Use Local Version
Revert To Base
You can use these to choose how you want to resolve the conflict.
These 3 options seem to work fine on my quick testing.
--
Regards,
Pratyush Yadav
next prev parent reply other threads:[~2019-10-03 20:54 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-25 20:38 [PATCH 1/2] git-gui: use existing interface to query a path's attribute Bert Wesarg
2019-09-25 20:38 ` [PATCH 2/2] git-gui: support for diff3 conflict style Bert Wesarg
2019-09-29 15:04 ` Pratyush Yadav
2019-09-30 12:17 ` Bert Wesarg
2019-09-30 12:20 ` [PATCH v2 1/2] git-gui: use existing interface to query a path's attribute Bert Wesarg
2019-09-30 12:20 ` [PATCH v2 2/2] git-gui: support for diff3 conflict style Bert Wesarg
2019-09-30 19:54 ` [PATCH v3 1/2] git-gui: use existing interface to query a path's attribute Bert Wesarg
2019-10-01 14:24 ` Pratyush Yadav
2019-10-01 15:22 ` Bert Wesarg
2019-10-01 17:31 ` Pratyush Yadav
2019-10-02 7:35 ` Bert Wesarg
2019-10-02 7:36 ` [PATCH v3 2/2] git-gui: support for diff3 conflict style Bert Wesarg
2019-10-02 23:54 ` Pratyush Yadav
2019-10-03 20:02 ` [PATCH " Philip Oakley
2019-10-03 20:54 ` Pratyush Yadav [this message]
2019-10-03 21:40 ` Philip Oakley
[not found] ` <CAKPyHN0_AUqLpPVDNJUZqNV8zRQzaDOMXJV4AbnK969AdtGpNg@mail.gmail.com>
2019-10-04 16:09 ` Philip Oakley
2019-09-27 5:27 ` [PATCH 1/2] git-gui: use existing interface to query a path's attribute Pratyush Yadav
-- strict thread matches above, loose matches on Subject: below --
2011-03-30 6:44 [PATCH 1/2] git-gui: support for underline styles Bert Wesarg
2010-11-16 9:21 [PATCHv2 1/2] git-gui: respect conflict marker size Bert Wesarg
2010-11-16 9:26 ` [PATCH 2/2] git-gui: support for diff3 conflict style Bert Wesarg
2010-11-19 11:41 ` Pat Thoyts
2010-11-19 12:05 ` Bert Wesarg
2011-02-27 20:15 ` Bert Wesarg
2011-03-30 6:44 ` Bert Wesarg
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191003205407.uaguw7qyabfy3aym@yadavpratyush.com \
--to=me@yadavpratyush.com \
--cc=bert.wesarg@googlemail.com \
--cc=git@vger.kernel.org \
--cc=philipoakley@iee.email \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).