From: "brian m. carlson" <firstname.lastname@example.org> To: <email@example.com> Cc: "Martin Ågren" <firstname.lastname@example.org> Subject: [PATCH 0/3] FAQ entries for merges and modified files Date: Sat, 12 Sep 2020 20:48:21 +0000 [thread overview] Message-ID: <email@example.com> (raw) This series introduces a few new FAQ entries on various topics. The first describes why squash merging doesn't work for long-running branches. This is confusing for a lot of folks, including some pretty advanced developers, so it seems worth documenting. The second explains why reverts are not applied on merge if the change has been cherry-picked to both sides. We have documentation on this already in git-merge(1), but here we also advise using a rebase instead. I still see folks confused by this, so hopefully making it a little more visible (with a little more explanation) will be helpful. The third departs from the topic of merges to discuss modified files. I frequently see folks with perpetually modified files for one of two reasons: case-sensitivity problems and problems where someone failed to run the smudge or clean filter. In fact, we saw one of those problems recently on the list. The FAQ entry explains how to handle both situations and provides suggestions to prevent the former from happening again. I've answered all of these questions recently (some multiple times), so I figured I'd document this so that folks can hopefully discover more of this themselves and solve their problems more quickly. brian m. carlson (3): docs: explain why squash merges are broken with long-running branches docs: explain why reverts are not always applied on merge docs: explain how to deal with files that are always modified Documentation/gitfaq.txt | 85 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 85 insertions(+)
next reply other threads:[~2020-09-12 20:51 UTC|newest] Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-09-12 20:48 brian m. carlson [this message] 2020-09-12 20:48 ` [PATCH 1/3] docs: explain why squash merges are broken with long-running branches brian m. carlson 2020-09-13 15:05 ` Martin Ågren 2020-09-13 17:12 ` brian m. carlson 2020-09-12 20:48 ` [PATCH 2/3] docs: explain why reverts are not always applied on merge brian m. carlson 2020-09-13 15:12 ` Martin Ågren 2020-09-12 20:48 ` [PATCH 3/3] docs: explain how to deal with files that are always modified brian m. carlson 2020-09-13 15:13 ` Martin Ågren 2020-09-12 21:48 ` [PATCH 0/3] FAQ entries for merges and modified files Junio C Hamano 2020-09-20 23:22 ` [PATCH v2 " brian m. carlson 2020-09-20 23:22 ` [PATCH v2 1/3] docs: explain why squash merges are broken with long-running branches brian m. carlson 2020-09-20 23:22 ` [PATCH v2 2/3] docs: explain why reverts are not always applied on merge brian m. carlson 2020-09-20 23:22 ` [PATCH v2 3/3] docs: explain how to deal with files that are always modified brian m. carlson
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 \ --firstname.lastname@example.org \ --email@example.com \ --firstname.lastname@example.org \ --email@example.com \ --subject='Re: [PATCH 0/3] FAQ entries for merges and modified files' \ /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
Code repositories for project(s) associated with this 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).