From: "Dušan Červenka | ACRIOS" <cervenka@acrios.com>
To: git@vger.kernel.org
Subject: Git merge improvement - "remove spaces/tabs from beginning of line and end of line"
Date: Wed, 11 Aug 2021 00:25:10 +0200 [thread overview]
Message-ID: <2632907.cDO7J6XS3R@kuhadatko-gl552vw> (raw)
[-- Attachment #1: Type: text/plain, Size: 1155 bytes --]
Greetings,
i was interested if you already considered this as feature, or if you may
consider this as good feature. I know that during merge every character need
be considered. And at the end it will be. I described my problem to another
developer and he named this feature as good noise merge reduction.
Issue:
Several times it happened that i added or removed condition in code but a lot
of code stayed. Only indention was changed. If there was also other change on
some line i had a conflict. And several times it happened that a lot of code
was appended instead of replaced (if some line was similar with same
indention). This made merging messed and confusing. If we would remove this
spaces noise from beginning and end, we could get more acquired merge. What do
you think? Of course this is only for looking for most matching lines. At the
end the code should keep all necessary spaces.
Thank you very much for your opinion.
--
Dušan Červenka | Software Developer
a: ACRIOS Systems s.r.o. | Razinova 2257/5 | Ostrava 700 30
e: cervenka@acrios.com | w: www.acrios.com
m: +421 918 715 117
[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2021-08-10 22:25 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-10 22:25 Dušan Červenka | ACRIOS [this message]
2021-08-11 23:12 ` Git merge improvement - "remove spaces/tabs from beginning of line and end of line" Jeff King
2021-08-13 6:57 ` Dušan Červenka | ACRIOS
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=2632907.cDO7J6XS3R@kuhadatko-gl552vw \
--to=cervenka@acrios.com \
--cc=git@vger.kernel.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.