jlahoda commented on PR #5617:
URL: https://github.com/apache/netbeans/pull/5617#issuecomment-1493311182
FWIW, if we can't use squash at merge time, then we can't, but it is pretty
unfortunate IMO.
The reasons why I am saying that are:
- force pushing into a branch makes reviewing more difficult; and even
force pushing into the branch right before a merge is breaking the record in
the PR - it is not clear what has been reviewed, because the commits that were
reviewed before do not exist anymore (AFAIK, at least)
- I am not a git expert, so I may be missing some simple way of doing that,
but when the feature branch includes merges (which it often does, as one
sometimes needs to merge with master, and rebasing breaks the PR history), it
is not, AFAIK, so easy to squash. I usually generate a patch and re-apply to a
clean branch, which not as easy.
So, overall, automatic squash at merge time seems like a fairly good option
to me: keeps the main history reasonable, preserves the PR history for the
future and is easy to do. I wonder if we should look at options to recover a
way of doing that.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscr...@netbeans.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscr...@netbeans.apache.org
For additional commands, e-mail: notifications-h...@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
