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
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.
If you love us? You can donate to us via Paypal or buy me a coffee so we can maintain and grow! Thank you!
Donate Us With