search

letmaik / vscode-git-tree-compare

🎄 VS Code extension for comparing the git working tree against a branch, tag, or commit, displayed as folder tree
https://marketplace.visualstudio.com/items?itemName=letmaik.git-tree-compare
MIT License
60 stars 7 forks source link

Unexpected diff after merging master into feature branch #69

Closed letmaik closed 4 years ago

letmaik commented 4 years ago

Left is master, right is the feature branch. At some point master was merged into the feature branch to keep up to date. The merge base however is still at the original branching point (o), determined by git merge-base master feature. Because of that, the diff includes all changes coming from the master merge as well, which is unexpected. I'm not sure what the right technique is to do this properly.

|   |
|  /|
|/  |
|   |
|  /
o
letmaik commented 4 years ago

Just tried to reproduce it but couldn't. Maybe my git version was too old. Works as expected with 2.18.