[RELEASES] Force push to delivery again

[Neil C Smith <ne...@apache.org>]

Hi,

Just had to force push delivery back a commit again, this time due to
me managing to merge master into it!  If someone could do a quick
sanity check that would be great.

Turns out that nice helpful looking resolve merge conflict UI on pull
reuqests should never be used on delivery.  The warning here explains
why https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/addressing-merge-conflicts/resolving-a-merge-conflict-on-github

For this I've now created an alternative pull request to handle the
merge and sync - https://github.com/apache/netbeans/pull/4486  We
could do with deciding and documenting how to handle (and not handle!)
this situation.

Best wishes,

Neil

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@netbeans.apache.org
For additional commands, e-mail: dev-help@netbeans.apache.org

For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists