Comment 23 for bug 1842297

Revision history for this message
Julian Clementson (oajulianc) wrote :

Thanks Jane. I can rebase again before then if it helps - was last done in April.

The only conflict you're likely to get in the merge is the database ID for the new admin permission, which will need bumping up again if there have been new permissions added on master since the last rebase. (Those IDs really ought to be GUIDs instead of integers to avoid this problem!)

PINES folks will need to be aware of that ID changing if/when they upgrade to the next release instead of using a patch for this feature.