This is an automated email from the ASF dual-hosted git repository. meonkeys pushed a commit to branch release-doc-fixes in repository https://gitbox.apache.org/repos/asf/fineract.git
commit 004d06e2e754e21022c49fbe741dfbf6bafd9a5e Author: Adam Monsen <[email protected]> AuthorDate: Sun Jul 27 16:20:34 2025 -0700 simplify finalize branch instructions Document what worked for me for 1.12.1. I didn't need to create the extra `merge-$VERSION` branch and do the recursive merge. --- buildSrc/src/main/resources/instructions/step13.txt.ftl | 12 ++++-------- .../src/docs/en/chapters/release/process-step13.adoc | 15 +++++---------- 2 files changed, 9 insertions(+), 18 deletions(-) diff --git a/buildSrc/src/main/resources/instructions/step13.txt.ftl b/buildSrc/src/main/resources/instructions/step13.txt.ftl index 64f6ff9bc6..3a734bc711 100644 --- a/buildSrc/src/main/resources/instructions/step13.txt.ftl +++ b/buildSrc/src/main/resources/instructions/step13.txt.ftl @@ -26,13 +26,9 @@ As discussed in https://issues.apache.org/jira/browse/FINERACT-1154, now that ev and make sure that everything on the release tag is merged to develop and that e.g. git describe works: >> git checkout develop ->> git branch -D ${project['fineract.release.version']} ->> git push origin :${project['fineract.release.version']} ->> git checkout develop ->> git checkout -b merge-${project['fineract.release.version']} ->> git merge -s recursive -Xignore-all-space ${project['fineract.release.version']} ->> git commit ->> git push <USER> ->> hub pull-request +>> git merge release/${project['fineract.release.version']} +>> git push origin develop +>> git branch -D release/${project['fineract.release.version']} +>> git push origin :release/${project['fineract.release.version']} [INSTRUCTIONS:END] diff --git a/fineract-doc/src/docs/en/chapters/release/process-step13.adoc b/fineract-doc/src/docs/en/chapters/release/process-step13.adoc index 131f1cbadb..e565d444b1 100644 --- a/fineract-doc/src/docs/en/chapters/release/process-step13.adoc +++ b/fineract-doc/src/docs/en/chapters/release/process-step13.adoc @@ -2,21 +2,16 @@ == Description -As discussed in https://issues.apache.org/jira/browse/FINERACT-1154[FINERACT-1154], now that everything is final, please do the following to remove the release branch (and just keep the tag), and make sure that everything on the release tag is merged to develop and that e.g. git describe works: +As discussed in https://issues.apache.org/jira/browse/FINERACT-1154[FINERACT-1154], now that everything is final, please do the following to remove the release branch (and just keep the tag), and make sure that everything on the release tag is merged to develop and that e.g. `git describe` works: [source,bash,subs="attributes+,+macros"] ---- % git checkout develop -% git branch -D {revnumber} -% git push origin :{revnumber} -% git checkout develop -% git checkout -b merge-{revnumber} -% git merge -s recursive -Xignore-all-space {revnumber} <1> -% git commit -% git push $USER -% hub pull-request +% git merge release/{revnumber} +% git push origin develop +% git branch -D release/{revnumber} +% git push origin :release/{revnumber} ---- -<1> Manually resolve merge conflicts, if any == Gradle Task
