CODEWITHSUNDEEP
gitmergecommand-line-interfacepull-request
Alberto
Alberto

Reputation: 12909

Unable to accept Pull Request Github because manual operations are required

I have a private repo, and a collaborator has just made a new PR removing useless file (IDE config and build), but when i go to the PR page, I see the usual commits of the PR, then i see the message that there are merge conflicts, but I'm no able to solve this conflicts online as usual:

PR

The problem is that none of the link present on this image are clickable, i can hover them, but as soon as i click them, nothing changes

Upvotes: 0

Views: 30

Answers (1)

matt
matt

Reputation: 534977

Ignore the github interface and resolve the conflict on your local machine. I'm not saying the github interface for resolving conflicts is bad — on the contrary, for what it is, it's cool — but you don't need it.

Upvotes: 1

Related Questions