[GitHub] [fineract] vorburger commented on pull request #1356: Fineract-1113 Add validation error for recovery repayments

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

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


   I've merged it now, by using Github "Squash", so it became a single commit, and I've adapted the message. Tips for future use:
   
   > Hi. Now I've somehow got an extra commit ([8964940](https://github.com/apache/fineract/commit/8964940108e623201ef1df0e7531301f7ee1da5c)) in here. 
   
   That's a "merge commit". If you use `git rebase develop` instead of `merge`, you avoid those _merge commits._
   
   > I tried to roll it back via git reset --soft HEAD~1 and another git push but I'm getting an " Updates were rejected because the tip of your current branch is behind hint: its remote counterpart." error. 
   
   You need to use `git push --force [tonic889]` in that case.
   
   > Sorry, I'm still new to git and it never works the way I expect it to.
   
   I'm sure you'll learn! Keep sending PRs - practice is the best way to learn... :smile: 


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