itamarc edited a comment on pull request #113:
URL: https://github.com/apache/commons-codec/pull/113#issuecomment-1046250451
Hi, @kinow (olá)
I can work on solving the conflicts and also squash the commits to one,
but...
1) I don't know how to see the conflicts, I can only see the list of files
with conflicts. Maybe it's because I don't have write permission on
commons-codec repository:
> **This branch has conflicts that must be resolved**
> Only those with [write
access](https://docs.github.com/articles/what-are-the-different-access-permissions)
to this repository can merge pull requests.
> **Conflicting files**
> (...)
(there are a "Resolve conflicts" button, but it's disabled for me)
How can I see the conflicts so I can solve them?
2) After solving the conflicts, can I squash the commits on my own branch
and it will show up on the PR?
Sorry, it's my first PR of this size. And thank you in advance for your help.
Itamar
--
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.
To unsubscribe, e-mail: issues-unsubscr...@commons.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
