verhas commented on issue #489: Code simplification using the methods that we have instead URL: https://github.com/apache/commons-lang/pull/489#issuecomment-587074905 I issued the ``` git remote add upstream [email protected]:apache/commons-lang.git git fetch upstream git checkout functions-vp-20200203-3 git merge upstream/master ``` commands. Then I resolved the conflicts in IntelliJ that were only in `Functions.java` and now it shows three other files changed. I do not understand why. Probably I have to learn more git. Sorry. I do not know if it really messes something up if it gets merged or just GIT is showing some diffs it should not.
---------------------------------------------------------------- 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: [email protected] With regards, Apache Git Services
