search

jakartaee / jakartaee-api

jakartaee-api
Other
39 stars 42 forks source link

Reapply missing PRs #54

Closed kwsutter closed 4 years ago

kwsutter commented 4 years ago

Not sure what happened, but when the 8.0.0-BRANCH was renamed to 8.0.x-BRANCH, some of the PRs were "lost".

I noticed that PR #52 and PR #49 didn't exist in the 8.0.x-BRANCH. But, when I look at these PRs, they were merged into the old 8.0.0-BRANCH... No idea why they are missing when all that I did was a simple rename.

Oh well, I'm glad I caught it. I also updated the parent pom version to 1.0.6 due to our move to the new Nexus instance.

pzygielo commented 4 years ago

Just advance new branch 8.0.x-BRANCH to d34ebf3 and it will be fine. It seems that it was created few commits too early (at d34ebf3). No need to remerge anything.

kwsutter commented 4 years ago

Just advance new branch 8.0.x-BRANCH to d34ebf3 and it will be fine. It seems that it was created few commits too early (at d34ebf3). No need to remerge anything.

Wow, thanks for the advice! Since I was working on the 8.0.-BRANCH at one point, maybe I forgot to "git pull" before doing the rename? Maybe that would have caused the missed PRs? Not sure. Thanks again. I get to learn something new with git with this advancing to a newer commit level. :-)

pzygielo commented 4 years ago

You can also fix in directly on GitHub - delete 8.0.x-BRANCH (it has no new commits), go to https://github.com/eclipse-ee4j/jakartaee-api/tree/d34ebf317f355caaed73928fa275b082a9261e18, and create [new] 8.0.x-BRANCH at this point.

kwsutter commented 4 years ago

Closing this PR. @pzygielo has provided better guidance.