Minor addition to Irreversible block definition

[bobgt]

Appended text to the current definition of Irreversible Block

[lparisc]

something went wrong here, I think the bobgt-patch-4 branch was not created of off release/2.0.x branch.

Just rebased to develop and it's fine now. However, 200+ changed files is not a good sign, regardless. The two branches should not be that far off. Seems like some PRs have not been properly backported or up-ported and now it's a mess.

[bobgt]

something went wrong here, I think the bobgt-patch-4 branch was not created of off release/2.0.x branch.

Err, I think I edited the file by clicking the Edit button on the Dev Portal page. That's why it created the bobgt-patch-4 branch from develop?

[lparisc]

something went wrong here, I think the bobgt-patch-4 branch was not created of off release/2.0.x branch.

Err, I think I edited the file by clicking the Edit button on the Dev Portal page. That's why it created the bobgt-patch-4 branch from develop?

Yes, since the edit feature on the dev portal picks develop by default. It's alright since it's still applicable to both branches. Just cherry-pick all commits to release/2.0.x in another PR once this one is approved.

[bobgt]

something went wrong here, I think the bobgt-patch-4 branch was not created of off release/2.0.x branch.

Just rebased to develop and it's fine now. However, 200+ changed files is not a good sign, regardless. The two branches should not be that far off. Seems like some PRs have not been properly backported or up-ported and now it's a mess.

Thanks for rebasing.

What steps do we need to take to ensure that the PRs are backported and up-ported?

[lparisc]

something went wrong here, I think the bobgt-patch-4 branch was not created of off release/2.0.x branch.

Just rebased to develop and it's fine now. However, 200+ changed files is not a good sign, regardless. The two branches should not be that far off. Seems like some PRs have not been properly backported or up-ported and now it's a mess.

Thanks for rebasing.

What steps do we need to take to ensure that the PRs are backported and up-ported?

For a PR merged to develop, if the changes are also applicable to a release branch, the commits must be backported to that release branch.

For a PR merged to a given release branch, if the changes are also applicable to a lower-versioned release branch, the commits must be backported to that branch. If the changes are also applicable to a higher-versioned release branch or the develop branch, the commits must be up-ported to those branches.

For either backporting or up-porting, the process involves cherry-picking the applicable commits. Check the "PR Resolution" process in Confluence.

[bobgt]

something went wrong here, I think the bobgt-patch-4 branch was not created of off release/2.0.x branch.

Just rebased to develop and it's fine now. However, 200+ changed files is not a good sign, regardless. The two branches should not be that far off. Seems like some PRs have not been properly backported or up-ported and now it's a mess.

Thanks for rebasing. What steps do we need to take to ensure that the PRs are backported and up-ported?

For a PR merged to develop, if the changes are also applicable to a release branch, the commits must be backported to that release branch.

For a PR merged to a given release branch, if the changes are also applicable to a lower-versioned release branch, the commits must be backported to that branch. If the changes are also applicable to a higher-versioned release branch or the develop branch, the commits must be up-ported to those branches.

For either backporting or up-porting, the process involves cherry-picking the applicable commits. Check the "PR Resolution" process in Confluence.

This is clear and helpful! Thanks!