[
Date Prev][
Date Next][
Thread Prev][
Thread Next][
Date Index][
Thread Index]
[
List Home]
|
Re: [glassfish-dev] Jakarta Mail and Jakarta Activation integrated with GlassFish
|
Easiest way is to rebase your branch on master and resolve conflicts in the branch.
-----Original Message-----
From: glassfish-dev-bounces@xxxxxxxxxxx <glassfish-dev-bounces@xxxxxxxxxxx> On Behalf Of Bill Shannon
Sent: 13 March 2020 00:50
To: glassfish developer discussions <glassfish-dev@xxxxxxxxxxx>
Subject: [glassfish-dev] Jakarta Mail and Jakarta Activation integrated with GlassFish
I've integrated Jakarta Mail 2.0.0 and Jakarta Activation 2.0.0 with GlassFish and submitted a pull request, please review:
https://github.com/eclipse-ee4j/glassfish/pull/22941
This was done as a branch in the glassfish repo.
I now need to resync this branch with the latest changes in the master.
What's the correct way to do that, assuming there might be conflicts?
_______________________________________________
glassfish-dev mailing list
glassfish-dev@xxxxxxxxxxx
To unsubscribe from this list, visit https://www.eclipse.org/mailman/listinfo/glassfish-dev
