kusalk commented on PR #809: URL: https://github.com/apache/struts/pull/809#issuecomment-1859089783
The diff for this PR is confusing me - it seems like some of the changes from my PRs (#800 and #806) are already present on the 7.0 branch and some are in this PR? Anyway, I trust you know what you're doing so go ahead and merge this - but I usually avoid rebasing and rewriting history for release branches (or any long-living branch) because resolving conflicts can become cumbersome and complex, and it's often harder to revert back to a previous state in case of a mistaken push or change I find it simpler to use merge commits as I did in #797 - I created that PR as follows: ``` git checkout release/struts-7-0-x git pull git checkout -b merge-master-to-70-2024-12-17 git merge origin/master ``` And then I created a PR from `merge-master-to-70-2024-12-17` targeting `release/struts-7-0-x`. Just an alternative approach you might find easier in the future :) -- 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]
