Re: Please set: git config --global pull.rebase true

> > So in short: Prefer Rebase, but whenever it gets complicated: STAY WITH > MERGES!!! > That's fine advice! I think my proposal (this particular git setting) is supportive of that since in the event of a merge conflict, at that point you can choose what to do -- resolve simple conflicts and con

Lucene/Solr Github PR report Oct 2020

Hi, I ran dev-tools/scripts/githubPRs.py and seems we have some housekeeping to do here. As always, the first section lists PRs withuot a JIRA ref in title (format SOLR-XXX or LUCENE-XXX). These are probably not correctly linked. The second section lists PRs which are still open even if the lin

RE: Please set: git config --global pull.rebase true

Hi, I fully agree here and yes we should have stayed with Subversion then. The merge commits are IMHO the best thing of Git to track if complicated merges were going on (one thing that never worked with Git). Not that you misunderstand me: I am fine with rebasing (when it works and is ea

Re: 8.7 Release

Please go ahead. I will add the section today. I believed the section is added once the RC1 is generated — but let me get this done. Thanks for pointing it out. On Wed, 21 Oct 2020 at 07:01, Houston Putman wrote: > I will be committing SOLR-14907 >