From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andreas Gruenbacher Date: Wed, 8 May 2019 22:17:12 +0200 Subject: [Cluster-devel] GFS2: Pull Request In-Reply-To: References: Message-ID: List-Id: To: cluster-devel.redhat.com MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Linus, On Wed, 8 May 2019 at 20:06, Linus Torvalds wrote: > On Wed, May 8, 2019 at 10:55 AM Linus Torvalds > wrote: > > > > See what I'm saying? You would ask me to pull the un-merged state, but > > then say "I noticed a few merge conflicts when I did my test merge, > > and this is what I did" kind of aside. > > Side note: this is more important if you know of a merge issue that > doesn't cause a conflict, and that I won't see in my simple build > tests. > > For example, in this case, the merge issue doesn't cause a conflict > (because it's a totally new user of bio_for_each_segment_all() and the > syntax changed in another branch), but I see it trivially when I do a > test build, since the compiler spews out lots of warnings, and so I > can trivially fix it up (and you _mentioning_ the issue gives me the > heads up that you knew about it and what it's all about). > > But if it's other architectures, or only happens under special config > options etc, I might not have seen the merge issue at all. And then > it's really good if the maintainer talks about it and shows that yes, > the maintainer knows what he's doing. > > Now I'm in the situation where I have actually done the merge the way > I *like* doing them, and without your superfluous merge commit. But if > I use my merge, I'll lose the signature from your tag, because you > signed *your* merge that I didn't actually want to use at all. > > See? Your "helpful" merge actually caused me extra work, and made me > have to pick one of two *worse* situations than if you had just tagged > your own development tree. Either my tree has a extra pointless merge > commit, or my tree lacks your signature on your work. Ok, got it. Would it make sense to describe how to deal with merge conflicts in Documentation/maintainer/pull-requests.rst to stop people from getting this wrong over and over again? Thanks, Andreas