TortoiseSVN Commit failed: MERGE failed

Question

I'm having troubles to commit any change after merging on pull-request from github respository. I'm using TortoiseSVN 1.7.11, Build 23600 - 64 Bit , 2012/12/12 19:08:52 Subversion 1.7.8,

The error I'm getting when trying to commit the changes (or any minor change) is:

Error - Commit failed (details follow):

Error - MERGE failed

I've tried to use the clean up option over the main project directory, then SVN Update over the same folder and finally using the SVN Commit... action and still having the same exact issue.

I'm using the last downloaded revision of my project and I'm just trying to add a number to a line. As you can see, the changes I'm trying to commit are minimum.

I've also tried to resolve the merge conflicts manually but still getting the same error when commiting.

I even tried to download the repository again in another folder on my computer, then adding this number in a line and then commiting and stil having the error.

Any idea about how to solve this?

Thanks.

Answer 1

There was a temporary problem at Github. They reported it as fixed two hours ago. Tested it, works for me again.

Answer 2

Or, if your file is bigger than 100 MB.