fineract-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From GitBox <...@apache.org>
Subject [GitHub] [fineract] vorburger commented on pull request #1396: FINERACT-1188: README and other files are not covered by Spotless
Date Tue, 13 Oct 2020 23:18:47 GMT

vorburger commented on pull request #1396:
URL: https://github.com/apache/fineract/pull/1396#issuecomment-708060695


   @vidakovic Whoa! Nice. I'll review ASAP, but 1 quick minor practical feedback already:
If you change the usual merge drop-down (above) to the _Rebase and merge_ which we typically
prefer using (see https://github.com/apache/fineract#merge-strategy), you'll see that GitHub
shows _This branch cannot be rebased due to conflicts_. That means we would HAVE to merge
your 2 commits here with _Create a merge commit_, which is possible, but always a bit "ugly"
and we try to avoid, or with _Squash and merge_ and that creates weird author/ownership metadata
(check out e.g. latest e57b7da). If you don't mind, just do a `git rebase develop` (fixing
anything required), and `git push --force  vidakovic`, and it will be a little bit "cleaner".
With that out of the way, I'll review the actual changes now! :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



Mime
View raw message