Skip to content

Conversation

@verhas
Copy link
Contributor

@verhas verhas commented Feb 3, 2020

of retyping their functionality. We expect the users of the library to use the provided methods, then we have to use these methods in the library code where it absolutely makes sense.

@verhas verhas force-pushed the functions-vp-20200203-3 branch from c0fb980 to 76b03df Compare February 9, 2020 15:58
@coveralls
Copy link

coveralls commented Feb 9, 2020

Coverage Status

Coverage increased (+0.04%) to 95.102% when pulling 62604b3 on verhas:functions-vp-20200203-3 into bd147ae on apache:master.

@garydgregory
Copy link
Member

@verhas,
May you please resolve conflicts here?
Thank you!
Gary

…0203-3

Conflicts:
	src/main/java/org/apache/commons/lang3/Functions.java
@verhas
Copy link
Contributor Author

verhas commented Feb 17, 2020

I issued the

git remote add upstream git@github.com: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.

@garydgregory
Copy link
Member

@verhas this PR looks all messed up compared to what was here before. Learning more about git is a good thing no matter what ;-)

@verhas verhas closed this Feb 17, 2020
@verhas verhas deleted the functions-vp-20200203-3 branch February 17, 2020 19:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants