fineract-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From GitBox <...@apache.org>
Subject [GitHub] [fineract] vidakovic edited a comment on pull request #1396: FINERACT-1188: README and other files are not covered by Spotless
Date Wed, 14 Oct 2020 00:10:10 GMT

vidakovic edited a comment on pull request #1396:
URL: https://github.com/apache/fineract/pull/1396#issuecomment-708072665


   @vorburger I think I get an idea what happened here with the rebase... I first tried to
solve this in the browser, but somehow lost my changes... and then "fixed" the conflict by
merging the PR branch into my vidakovic/fineract develop branch (which was suggested by Github...
don't remember where I read)... and that lead to the current PR branch.
   
   So, I'll try to bring my develop branch again to the same level as upstream - without my
additional conflict fix merge. And then your instructions should work. Will let you know here...
thanks again.
   
   Update: sweet... that worked... learned again 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



Mime
View raw message