From: Bram Huenaerts <bramhuenaerts@me.com>
To: git@vger.kernel.org
Subject: Git union issue
Date: Thu, 30 Jul 2020 20:29:10 +0200 [thread overview]
Message-ID: <A7C11212-1ECB-4D8D-B3B1-C7DB6673F3E6@me.com> (raw)
[-- Attachment #1: Type: text/plain, Size: 448 bytes --]
Goodafternoon,
while trying to reduce conflicts on a changelog file, i tried eliminating conflicts using the .gitattributes with union defined for the CHANGELOG_UPCOMING.md file. I included the steps to come to this very strange issue. In the enclosed PDF, I tried to specify all the commands so it is easy to reproduce this strange issue which I hope is not a works as designed.
In case still something not clear. I’m happy to assist.
[-- Attachment #2: git-union-issue.pdf --]
[-- Type: application/pdf, Size: 56068 bytes --]
[-- Attachment #3: Type: text/plain, Size: 31 bytes --]
Kind regards,
Bram Huenaerts
next reply other threads:[~2020-07-30 18:29 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-30 18:29 Bram Huenaerts [this message]
2020-07-31 1:05 ` Git union issue brian m. carlson
2020-07-31 2:12 ` Junio C Hamano
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=A7C11212-1ECB-4D8D-B3B1-C7DB6673F3E6@me.com \
--to=bramhuenaerts@me.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 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).