Logo Questions Linux Laravel Mysql Ubuntu Git Menu
 

Enable edit mode in 3-way diff using sublimerge

I'm trying to integrate sublime and git together and sublimerge seems to be a great tool except that I can't find a way to allow manual edits when doing a 3-way diff (e.g. a resolve a merge conflict).

Does anyone know of a way to do this (in any version of sublime/sublimerge)?

p.s. Sublime Text 3 and sublimerge v2.10.5

like image 546
Tom Rees Avatar asked Oct 19 '22 08:10

Tom Rees


1 Answers

No. According to the developers (I emailed them), due to limitations in Sublime’s API, edit mode is not available in three-way diff view.

like image 81
SCdF Avatar answered Oct 21 '22 22:10

SCdF