~THIS VIDEO IS FOR EDUCATIONAL PURPOSES ONLY~ In this video, I will demonstrate how to download any document from the Scribd website for free and without entering your credit card! ~Our Last Video~ .... Here we can easily download scribd website book
Be like the sun for grace and mercy. Be like the night to cover others' faults. Be like running water
Idea Transcript
Bitbucket / Public Issue Tracker / master / Issues
"Sync repository" fails w/o any indication why?! Issue #8975
INVALID
Marsu42 created an issue 2014-02-15 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) Jonathan Mooring STAFF changed status to on hold 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 2014-02-19
Jonathan Mooring STAFF assigned issue to Jonathan Mooring 2014-02-19
Zachary Davis removed component Removing component: repository (automated comment) 2014-02-21
Jonathan Mooring STAFF changed status to invalid Closing this issue for now to remove it from our queue. If you require additional assistance, please feel free to re-open it. 2014-02-24