ediff on merge contains diffs not shown normally #491

Closed
monsanto opened this Issue Oct 5, 2012 · 7 comments

Comments

Projects
None yet
4 participants
Contributor

monsanto commented Oct 5, 2012

If you merge with a branch and there are conflicts, magit will show those files as "Unmerged", and TAB will show the conflicts. One would expect running ediff at this point will show those (and only those) conflicts, but it actually shows the diffs of the entire merge (including the diffs that git was able to automatically resolve). I find this counterintuitive and think that the diffs shown by ediff should be the same as the ones shown by TAB.

Contributor

monsanto commented Oct 5, 2012

By the way, this is easily done by running smerge-ediff on the "Unmerged" file.

Contributor

vanicat commented Oct 5, 2012

Typing $$ in the ediff merge command buffer will focus on the conflicting part. We could try to default to that someway.

Contributor

monsanto commented Oct 7, 2012

So I know about $$--but I was asking what should we do. I think it is a nice property for ediff to mirror the diffs shown on magit status. Do you disagree? If you agree, then I can provide a simple patch to provide this behavior, maybe with a user configurable flag.

Starting out in $$ mode would be a nice default. Personally I didn't know $$ mode existed until I went searching for this bug.

Owner

tarsius commented Sep 4, 2013

I do agree, and such a patch would be great :-)

@tarsius tarsius modified the milestones: better diff, 2.2.0 Mar 2, 2014

Owner

tarsius commented Mar 2, 2014

Please see #1261.

@tarsius tarsius closed this Mar 2, 2014

@tarsius tarsius modified the milestones: support/later/needinfo/..., better diff Mar 2, 2014

@tarsius tarsius added the . label Mar 4, 2014

@tarsius tarsius modified the milestones: 2.1.0, support/later/needinfo/... Mar 4, 2014

@tarsius tarsius removed the . label May 29, 2014

Owner

tarsius commented Jul 6, 2014

Finally fixed, at least on the next branch. See #1420.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment