Thank you for sharing your code, Terran. However it is very difficult to work the branch that you have shared. It includes many extraneous commits related to other PINES customization and it is based on rel_3_10_0. For these reasons, I find it impossible to rebase this branch on a more recent rel_3_10 or main. I get many conflicts and I don't know what your intentions were, so I can't resolve them.
I have isolated what I think are four relevant commits for the ecard and renewal functionality, but when I try to cherry-pick these to rel_3_10 or to main, I still get conflicts that I am unable to resolve.
If you could provide another branch with just these four commits on top of a recent rel_3_10 or main, it would be extremely helpful:
Thank you for sharing your code, Terran. However it is very difficult to work the branch that you have shared. It includes many extraneous commits related to other PINES customization and it is based on rel_3_10_0. For these reasons, I find it impossible to rebase this branch on a more recent rel_3_10 or main. I get many conflicts and I don't know what your intentions were, so I can't resolve them.
I have isolated what I think are four relevant commits for the ecard and renewal functionality, but when I try to cherry-pick these to rel_3_10 or to main, I still get conflicts that I am unable to resolve.
If you could provide another branch with just these four commits on top of a recent rel_3_10 or main, it would be extremely helpful:
b65d8f18ba42556 6e9192fc2feb549 e111dbc08f 39f43bf87fdaa56 49fb8bd61d c39993ec7d5b4aa a987faccc7 7ddddd158bc9326 9fb82b6911 d583ab13d4d54cd c56a45581e
956125f40046285
d74979198daea9f
5acbe9ba703015b
e2a266114902c32
Thanks,
Jason Stephenson