Issue #8975 invalid

"Sync repository" fails w/o any indication why?!

Marsu42
created an issue

When I try to sync my fork with the master (if you want to try: https://bitbucket.org/Marsu42/ml-mod6d) I'm getting the error message "Unable to merge - conflicts during merge". Problem is: even after resolving all issues with files marked with "conflict" in the diff, it still fails w/o any file marked as a problem - unlike the promised "View the conflicts".

I have encountered this problem multiple times by now and the only solution I found is to completely reset, i.e. delete the repo, re-fork and re-patch in all my changes. Is there any way to find out what the problem is?

Comments (4)

  1. Jon Mooring staff

    Hey Marsu42,

    I wasn't able to reproduce this issue with my own test repositories, but I can tell you that we don't use Git's internal merge algorithm for comparisons, but rather a simplified version for performance reasons. This may be why you don't see any conflicts in the comparison, but you are still unable to merge from upstream.

    Have you tried merging upstream changes via the CLI to see if you get different results? This might help narrow down where the problem lies.

    Thanks,
    Jon

  2. Log in to comment