From: <lin.sun@zoom.us>
To: "'Pratyush Yadav'" <me@yadavpratyush.com>,
"'sunlin via GitGitGadget'" <gitgitgadget@gmail.com>
Cc: <git@vger.kernel.org>, "'sunlin'" <sunlin7@yahoo.com>
Subject: RE: [PATCH v2] Enable auto-merge for meld to follow the vim-diff beharior
Date: Tue, 9 Jun 2020 11:33:05 +0800 [thread overview]
Message-ID: <311401d63e0e$b1ffe490$15ffadb0$@zoom.us> (raw)
Hi Pratyush,
Yes, you're totally right, it's my typo, and it's fixed by my last commit [PATCH v2].
I tried git merge-tool with meld and found there is "auto-merge" option for better experience.
The "auto-merge" was added since meld 1.7 (Year 2012).
Here're some documents for it.
https://meldmerge.org/features.html
https://lukas.zapletalovi.com/2012/09/three-way-git-merging-with-meld.html
Regards
Lin
-----Original Message-----
From: Pratyush Yadav <me@yadavpratyush.com>
Sent: Monday, June 8, 2020 17:50
To: sunlin via GitGitGadget <gitgitgadget@gmail.com>
Cc: git@vger.kernel.org; sunlin <sunlin7@yahoo.com>; lin.sun <lin.sun@zoom.us>
Subject: Re: [PATCH] Enable auto-merge for meld to follow the vim-diff beharior
Hi Lin,
I'm not familiar with the code so I'll let someone else comment on that.
But...
On 08/05/20 01:25AM, sunlin via GitGitGadget wrote:
> From: "lin.sun" <lin.sun@zoom.us>
>
> The mergetool "meld" does NOT merge the no-conflict changes, while the
> mergetool "vimdiff" will merge the no-conflict parts and highlight the
> conflict parts.
> This patch will make the mergetool "meld" similar to "vimdiff",
> auto-merge the no-conflict parts, highlight conflict parts.
>
> Signed-off-by: Lin Sun <sunlin7@yahoo.com>
... your name and email in "From:" and "Signed-off-by:" should be the same. So either use "lin.sun" <lin.sun@zoom.us> in both places or use Lin Sun <sunlin7@yahoo.com> in both.
--
Regards,
Pratyush Yadav
next reply other threads:[~2020-06-09 3:33 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-09 3:33 lin.sun [this message]
2020-06-28 6:23 ` [PATCH v2] Enable auto-merge for meld to follow the vim-diff beharior lin.sun
2020-06-28 10:37 ` Đoàn Trần Công Danh
2020-06-29 9:08 ` lin.sun
2020-06-30 6:48 ` David Aguilar
2020-06-30 15:55 ` Junio C Hamano
-- strict thread matches above, loose matches on Subject: below --
2020-05-08 1:25 [PATCH] " sunlin via GitGitGadget
2020-06-09 3:19 ` [PATCH v2] " sunlin via GitGitGadget
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='311401d63e0e$b1ffe490$15ffadb0$@zoom.us' \
--to=lin.sun@zoom.us \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=me@yadavpratyush.com \
--cc=sunlin7@yahoo.com \
/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.
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 NNTP newsgroup(s).