[GitHub] [fineract] vorburger edited a comment on pull request #1390: Merge git tag '1.4.0' into branch 'develop' (FINERACT-1154)

[GitBox <gi...@apache.org>]

vorburger edited a comment on pull request #1390:
URL: https://github.com/apache/fineract/pull/1390#issuecomment-706724696


   > @vorburger I'm assuming the right thing to do now is to just do a "merge pull request" - i.e. not a squash, or rebase? Just confirming before I mess something up...
   
   Yup! Note that you actually cannot use _Rebase and merge_ (see that it's "greyed out" on the UI?). And _Squash and merge_, while available (green) and "possible", as far as I understand things actually wouldn't do at all what you/we are after here - I think that would create 1 "empty" commit, without the merge commit that's really what this is all about (`git describe`) - pointless. So TL;DR, yeah, click _Merge pull request_ which _Create a merge commit_. My hope here is that GitHub is somehow smart enough to see that this PR ALREADY ends with a Merge Commit (the 09e08fdc71e86d0133ebf0c27f829d07738208af), and doesn't add ANOTHER one. If it does, then IMHO that's a bit "ugly" - but not the end of the world either. Go for it! :smiling_imp: 


----------------------------------------------------------------
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:
users@infra.apache.org