You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@struts.apache.org by "lukaszlenart (via GitHub)" <gi...@apache.org> on 2023/12/16 15:50:20 UTC
[PR] Rebase struts-7-0-x branch [struts]
lukaszlenart opened a new pull request, #809:
URL: https://github.com/apache/struts/pull/809
Rebases struts-7-0-x branch to be up to date with the master branch.
--
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-unsubscribe@struts.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Rebase struts-7-0-x branch [struts]
Posted by "kusalk (via GitHub)" <gi...@apache.org>.
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: notifications-unsubscribe@struts.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Rebase struts-7-0-x branch [struts]
Posted by "lukaszlenart (via GitHub)" <gi...@apache.org>.
lukaszlenart commented on PR #809:
URL: https://github.com/apache/struts/pull/809#issuecomment-1859114964
I rebased `release/struts-7-0-x` but looks like I missed something during that process, that's why I created the PR with all the missing parts
--
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-unsubscribe@struts.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Rebase struts-7-0-x branch [struts]
Posted by "sonarcloud[bot] (via GitHub)" <gi...@apache.org>.
sonarcloud[bot] commented on PR #809:
URL: https://github.com/apache/struts/pull/809#issuecomment-1858850548
## [](https://sonarcloud.io/dashboard?id=apache_struts&pullRequest=809) **Quality Gate failed**
Failed conditions
[52.6% Coverage on New Code](https://sonarcloud.io/component_measures?id=apache_struts&pullRequest=809&metric=new_coverage&view=list) (required ≥ 80%)
[See analysis details on SonarCloud](https://sonarcloud.io/dashboard?id=apache_struts&pullRequest=809)
--
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-unsubscribe@struts.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Rebase struts-7-0-x branch [struts]
Posted by "sonarcloud[bot] (via GitHub)" <gi...@apache.org>.
sonarcloud[bot] commented on PR #809:
URL: https://github.com/apache/struts/pull/809#issuecomment-1858879853
## [](https://sonarcloud.io/dashboard?id=apache_struts&pullRequest=809) **Quality Gate failed**
Failed conditions
[52.6% Coverage on New Code](https://sonarcloud.io/component_measures?id=apache_struts&pullRequest=809&metric=new_coverage&view=list) (required ≥ 80%)
[See analysis details on SonarCloud](https://sonarcloud.io/dashboard?id=apache_struts&pullRequest=809)
--
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-unsubscribe@struts.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Rebase struts-7-0-x branch [struts]
Posted by "lukaszlenart (via GitHub)" <gi...@apache.org>.
lukaszlenart merged PR #809:
URL: https://github.com/apache/struts/pull/809
--
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-unsubscribe@struts.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Rebase struts-7-0-x branch [struts]
Posted by "kusalk (via GitHub)" <gi...@apache.org>.
kusalk commented on PR #809:
URL: https://github.com/apache/struts/pull/809#issuecomment-1859138777
All good then :)
--
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-unsubscribe@struts.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org