René's URL Explorer Experiment

{"@context":"https://schema.org","@type":"DiscussionForumPosting","headline":"Diff.merge: inconsistent behavior","articleBody":"I have two diffs, one from `commit.getDiffWithOptions` and one from `NodeGit.Diff.treeToWorkdirWithIndex` where the tree is from the head commit. They were made with the same options. When merging the two diffs, depending on which diff is merged into which, either the diffs will merge or this error will be thrown:\n\n\u003e Error: Attempt to merge diffs created with conflicting options\n\nHere's some kind of pseudo code\n\n``` javascript\nlet workDirWithIndexDiff;\nrepo.getHeadCommit()\n  .then(headCommit =\u003e headCommit.getTree())\n  .then(headTree =\u003e NodeGit.Diff.treeToWorkdirWithIndex(repo, headTree, {}))\n  .then(_workDirWithIndexDiff =\u003e {\n    workDirWithIndexDiff = _workDirWithIndexDiff;\n    return someCommit.getDiffWithOptions({});\n  })\n  .then(someDiff =\u003e {\n    // This would reject with Error: Attempt to merge diffs created with conflicting options\n    someDiff.merge(workDirWithIndexDiff);\n\n    // This would resolve\n    workDirWithIndexDiff.merge(someDiff);\n  });\n```\n","author":{"url":"https://github.com/smith-kyle","@type":"Person","name":"smith-kyle"},"datePublished":"2016-04-23T00:32:09.000Z","interactionStatistic":{"@type":"InteractionCounter","interactionType":"https://schema.org/CommentAction","userInteractionCount":2},"url":"https://github.com/1002/nodegit/issues/1002"}