rothardo commented on PR #6797: URL: https://github.com/apache/netbeans/pull/6797#issuecomment-1848418317
Hi @mbien, I hope this message finds you well. I've recently gone through the [contributing guidelines](https://github.com/apache/netbeans/blob/120f2129a8dbc25b7a52542c359fe5a7a2569c60/.github/CONTRIBUTING.md) for the NetBeans project and I'm seeking some clarification on the squashing process. I attempted to squash my commits interactively in Vim, but encountered conflicts during the process. Specifically, I'm puzzled by an unexpected commit in the pull request [6797](https://github.com/apache/netbeans/pull/6797). In commit [8916655](https://github.com/apache/netbeans/pull/6797/commits/891665543a70e466b4fd862f32b495a3e7b4252c), I reconfigured the author's name. Subsequently, when I executed `git pull`, I noticed an automatic commit [Merge branch 'apache:master' into hudsontojenkins](https://github.com/apache/netbeans/pull/6797/commits/32a8216b3179e76031b2767e354d877d055a5bb1). Could you please provide further guidance on the squashing process and help me understand why the mentioned merge commit was automatically generated? I want to ensure that I follow the correct procedures and address any issues promptly. Your expertise in clarifying this matter would be greatly appreciated. -- 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: [email protected] For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected] For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
