kinow commented on pull request #165: URL: https://github.com/apache/commons-imaging/pull/165#issuecomment-917478355
Hi @gwlucastrig ! Great job fixing the code comments and trying to rebase. You have done everything correctly. And you will have indeed to push force. I always take a look at the remote branch in GitHub, and compare with my local branch (using gitk). If I'm happy that my local branch is the way I want my remote to look, then I push force. Note that you should avoid push-force to certain repos in case of existijg etiquette. E.g. linux project forbids push force to their main branches. Apache projects normally discourage too. But you are pushing force to your branch, to your fork. So it doesn't matter in this case. It's only to make merging the code easier :) I will take a look at the code latert oday gain, if nothing wrong will include one commit later with changes.xml and merge it! 👏 p.s.: a git rebase squash is an advanced git topic, great job! It is also part of the process for fixing conflicts, so you got most of what's needed to fix conflicts in the future p.p.s: I forgot to add a comment about scansize. Is it OK if I edit your commit when merging, and rename it to scanSize? -- 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]
