New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fixed issue #812 #842
Fixed issue #812 #842
Conversation
Conflicts: app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java app/src/main/java/fr/free/nrw/commons/upload/ShareActivity.java app/src/main/res/values/strings.xml
Codecov Report
@@ Coverage Diff @@
## master #842 +/- ##
=========================================
- Coverage 6.9% 6.85% -0.05%
=========================================
Files 95 95
Lines 5071 5105 +34
Branches 472 477 +5
=========================================
Hits 350 350
- Misses 4694 4728 +34
Partials 27 27
Continue to review full report at Codecov.
|
Thanks for this PR @ftsalamp .
|
This is a quite important fix, however need some small changes to pass tests. I want to edit this PR to merge it as soon as possible, however there is several approaches to edit someone else's PR. Does anyone can tell me the best approach, to make our commit history clean? |
I would say. |
Thanks @nicolas-raoul , but I have a small uncertainty. Since this changes on master branch of ftsalamp's fork, and you said create a feature branch from same point, with same name, what should be the name of the new feature branch? |
How about something like bugfix-812 ?
…On Sep 9, 2017 15:58, "neslihanturan" ***@***.***> wrote:
Thanks @nicolas-raoul <https://github.com/nicolas-raoul> , but I have a
small uncertainty. Since this changes on master branch of ftsalamp's fork,
and you said create a feature branch from same point, with same name, what
should be the name of the new feature branch?
—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
<#842 (comment)>,
or mute the thread
<https://github.com/notifications/unsubscribe-auth/AAGFBgFoeukyE8w0Z6knWZoXtukVPcNwks5sglM2gaJpZM4O0GIo>
.
|
It seems like my tests failed because of a problem that exists on master branch too. So I decided to resolve that issue on another PR. For now, I only resolved conflicts to be able to merge this changes. Thanks for this changes @ftsalamp . |
@neslihanturan Shall we close this so we can focus on #876 ? |
Fixed issue #812 using Approach A.