ptuomola commented on pull request #1387: URL: https://github.com/apache/fineract/pull/1387#issuecomment-706695310
Hi @vorburger - I'm almost sure I'm **not** doing this right :-) So really appreciate your input... As far as I can see, what we need to achieve is to have the tagged 1.4.0 release commit (ee99f30) reachable from the develop branch - so that "git describe" and jgitver etc can "see" it in commit history of develop. As far as I can see, either approach will achieve that. The only reason resolved the merge conflict "the wrong way" (i.e. into the branch rather than into develop) was because the Github UI made me do it. I agree with you that doing it "the other way" makes more sense - but as far as I can see, the outcome is the same regardless. But I'm definitely not an expert on this, so would be very keen to understand pros / cons of either approach! ---------------------------------------------------------------- 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]
