meonkeys commented on code in PR #4890:
URL: https://github.com/apache/fineract/pull/4890#discussion_r2237516034
##########
buildSrc/src/main/resources/vote/result.1.12.1.json:
##########
@@ -0,0 +1,48 @@
+{
Review Comment:
Shoot, I did mess up our [flat
history](https://github.com/apache/fineract#merge-strategy). Thanks for letting
me know!
And hmm, either GitHub is being confusing here or it's because I did a
traditional git merge rather than a rebase/squash merge, but this makes it
appear as if I intended to push commits to this PR. I didn't. The branch for
this PR was squashed and rebased on top of `develop`.
Anyway, regarding [my
merge](https://github.com/apache/fineract/commit/a8d23ee747406e30002de2ce33c772061c48d353),
sorry about that and thanks for the reminder. I was trying to add [one
commit](https://github.com/apache/fineract/commit/97aa931a5981ef2ed7cf8979be28d4aa62982df4)
as "1.12 maintenance" (since it was related to 1.12), make sure it was
included in `develop`, not mess up `git describe`, and simplify [the process to
close out a release branch
properly](https://fineract.apache.org/docs/current/#_step_13_close_release_branch).
I'll revisit that last one and make sure to preserve a flat history next time.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
