You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@fineract.apache.org by GitBox <gi...@apache.org> on 2020/10/11 12:54:36 UTC

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

vorburger opened a new pull request #1390:
URL: https://github.com/apache/fineract/pull/1390


   see related discussions in FINERACT-1154 and #1387, as per commit message on the merge commit:
   
       git checkout develop
       git checkout -b FINERACT-1154_merge-1.4.0
       git merge -s recursive -Xignore-all-space 1.4.0
   
   > see discussion in https://issues.apache.org/jira/browse/FINERACT-1154 for the full background about why we are doing this; the TL;DR is that this makes `git describe` work correctly, which is important for automation.
   
   @ptuomola would you be willing to merge this as an alternative to your #1387 ?
   
   @vidakovic FYI


----------------------------------------------------------------
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



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

Posted by GitBox <gi...@apache.org>.
vorburger commented 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 big "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



[GitHub] [fineract] ptuomola merged pull request #1390: Merge git tag '1.4.0' into branch 'develop' (FINERACT-1154)

Posted by GitBox <gi...@apache.org>.
ptuomola merged pull request #1390:
URL: https://github.com/apache/fineract/pull/1390


   


----------------------------------------------------------------
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



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

Posted by 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



[GitHub] [fineract] ptuomola commented on pull request #1390: Merge git tag '1.4.0' into branch 'develop' (FINERACT-1154)

Posted by GitBox <gi...@apache.org>.
ptuomola commented on pull request #1390:
URL: https://github.com/apache/fineract/pull/1390#issuecomment-706724010


   @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...


----------------------------------------------------------------
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



[GitHub] [fineract] ptuomola commented on pull request #1390: Merge git tag '1.4.0' into branch 'develop' (FINERACT-1154)

Posted by GitBox <gi...@apache.org>.
ptuomola commented on pull request #1390:
URL: https://github.com/apache/fineract/pull/1390#issuecomment-706725160


   It seems to have worked! Great stuff. And now "git describe" also says something useful. 


----------------------------------------------------------------
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



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

Posted by GitBox <gi...@apache.org>.
vorburger commented on pull request #1390:
URL: https://github.com/apache/fineract/pull/1390#issuecomment-706725421


   > My hope here is that GitHub is somehow smart enough to see that
   
   This didn't work - we now have 2 merge commits about this (the original 09e08fdc71e86d0133ebf0c27f829d07738208af AND 5365da4d243da92f4aa6a2edd17adf40d5c55950). I suspect that this most likely is because we merged #1389 as e978971c679d36705e38f3f4d0afe129ba7bd2de - if we had done it in the opposite order, perhaps GitHub would not have added that 2nd merge commit? Anyway, doesn't matter!


----------------------------------------------------------------
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