On Mon, 6 Feb 2023 at 17:28, Ernie Rael <err...@raelity.com> wrote: > There were some comments about squash/merge and how github/git commands > have issues going directly to main. I got confused because I missed the > "to main" versus "to PR branch" distinction.
Yes, sorry if I added to that confusion. The squash and merge UI in GitHub causes us a number of problems. Aside - the squash and rebase options should probably be disabled in .asf.yaml My comment was that committers squashing and merging locally and pushing directly to master causes us a bunch of different problems. Resolving merge conflicts is the same too - GitHub UI can cause problems / doing locally and pushing directly to master can cause problems. Ideally everything goes through the PR branch. > Here's my understanding: squashing and force pushing to a PR branch, in > particular one that I opened, does not run into issues. Yes, you're all good. Note that by default, every committer has write access to your PR branch too. I tend not to force push to other people's PR branches without checking first though! :-) > And from my perspective, as someone who never pushes to master, I can > ignore issues relating to peculiarities around local squash and merge > pushed directly to master. Yep! Best wishes, Neil --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@netbeans.apache.org For additional commands, e-mail: dev-h...@netbeans.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
