Hi Jody,
rebase won't work, there are multiple merges in that branch already, done
to handle
merge conflicts (the branch tends to accumulate a bunch), once a merge
commit is in
a PR, it cannot be merged with rebase anymore.
It would be easy to see, just try the various merge options but... hum...
One option for multiple authors on a commit is to use the
'Co-authored-by:' git commit hook, which github will respect and display:
https://docs.github.com/en/free-pro-team@latest/github/committing-changes-to-your-project/creating-a-commit-with-multiple-authors#creating-co-authored-commits-on-gi
Epic Andrea! As for merge options, is it too many changes for a rebase?
--
Jody Garnett
On Wed, 18 Nov 2020 at 08:18, Andrea Aime
wrote:
> Hi all,
> barring no objections, I plan to merge the branch into master during the
> next weekend.
> Was thinking of doing a normal merge, rather than a squ
Hi all,
barring no objections, I plan to merge the branch into master during the
next weekend.
Was thinking of doing a normal merge, rather than a squash merge, since
there are multiple
authors, but I'm open to discuss it, just let me know.
Will also merge GeoWebCache, since it has been ready for
Hi,
the unchecked warnings removal branch is finally green and ready for merge:
https://github.com/geotools/geotools/pull/3054
Comments, feedback? Anyone eager to press the "merge" button? :-D
The GeoWebCache counterpart is ready for merge too.
The GeoServer one is just getting started instead:
ht
