vorburger commented on pull request #1387: URL: https://github.com/apache/fineract/pull/1387#issuecomment-706693198
@ptuomola re. our discussion (together with @vidakovic) in FINERACT-1154, are you sure this is right, as is? If I'm following along correctly here, you have created [a `release-1.4.0` branch](https://github.com/apache/fineract/compare/release-1.4.0), presumably from [the 1.4.0 tag](https://github.com/apache/fineract/commits/1.4.0), and then in ffed594 _Merge branch 'develop' into release-1.4.0_ (don't we want to do the opposite?), and now this PR wants to merge 16 commits from that `release-1.4.0` branch back into `develop` - which is a NOOP, with no diff. The way I understood what you were after in FINERACT-1154 would be more something like this: ``` git checkout develop git checkout -b FINERACT-1154_merge-1.4.0 git merge -s recursive -Xignore-all-space 1.4.0 ``` This showed me 3 conflicts, which were relatively trivial to resolve; the result is https://github.com/apache/fineract/compare/develop...vorburger:FINERACT-1154_merge-1.4.0?expand=1. It's very similar to this - except for the last merge commit... your _Merge branch 'develop' into release-1.4.0_ has parents ee99f30 + e985597, whereas my _Merge tag '1.4.0' into develop (FINERACT-1154)_ has parents 3ee46b0 + ee99f30 - the "other way around" (and a later point on develop). Which is right/better? I'm honestly :smile_cat: asking, as I'm not 100% sure what we are after here. Whatever we conclude, we should then document it on https://cwiki.apache.org/confluence/display/FINERACT/How+to+Release+Apache+Fineract. ---------------------------------------------------------------- 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. For queries about this service, please contact Infrastructure at: [email protected]
