3 Way Merge Editor's detecting conflicts is not specific during rebase, better to hava a toggle back to old editor

[dionysuskvd]

Operation:
git rebase branch-xxx

in 1.68.1:

the editor could detect specific conflicts and choose which to keep easily,

in 1.70

the editor considers the whole file as conflict while there are only serveral lines changed,
personally i would pefer the old editor and wish to have a toggle back to it

[gjsjohnmurray]

See #157268 (comment) for how to reinstate the old behaviour. But the team probably wants to discover why this new feature isn't working well for you. Pinging @lszomoru

[hediet]

@Void-king can you share an anonymized version of your code, so we can debug this?

The conflict ranges in VS Code should have the same size as in git, so this is clearly a bug.
Most likely this is a flaw in our diffing algorithm, but we need a sample to investigate.

[dionysuskvd]

@hediet

here's my operations

create a new branch conflict
new and commit a file merge_conflict_test.go, with Name: "n1"

// branch conflict
package main

import (
	"github.com/gin-gonic/gin"
)

func Foo1(c *gin.Context) {
	s1 := s{
		ID:        111,
		Condition: "c1",
		Check:     true,
		Name:      "n1" // diff from master
	}
}

func Foo2(c *gin.Context) {
	line1 := "line1"
	line2 := "line2"
	line3 := "line3"
	line4 := "line4"
	line5 := "line5"
	line6 := "line6"
}

func Foo3(c *gin.Context) {
	s3 := s{
		ID:        123,
		Condition: "c3",
		Check:     true,
		Name:      "n3" // diff from master
	}
}

back to master, also new file merge_conflict_test.go, without Name: "n1"

// branch master
package main

import (
	"github.com/gin-gonic/gin"
)

func Foo1(c *gin.Context) {
	s1 := s{
		ID:        111,
		Condition: "c1",
		Check:     true,
	}
}

func Foo2(c *gin.Context) {
	line1 := "line1"
	line2 := "line2"
	line3 := "line3"
	line4 := "line4"
	line5 := "line5"
	line6 := "line6"
}

func Foo3(c *gin.Context) {
	s3 := s{
		ID:        123,
		Condition: "c3",
		Check:     true,
	}
}

commit, then goto conflict, rebase master

with "git.mergeEditor": false on

3 way merge editor:

[hediet]

I see. Currently, this is by design, but getting the same behavior as git might be preferrable here. Thanks!