Where is not a way to resolve conflicts line by line like the conflict resolver in WebStorm

sascha-wolf / sublime-GitConflictResolver

A little plugin to help you resolving this nasty conflicts.

MIT License

44 stars 6 forks source link

Where is not a way to resolve conflicts line by line like the conflict resolver in WebStorm #19

Closed SANGED closed 6 years ago

sascha-wolf commented 6 years ago

Just edit the conflicts by hand; this tool is meant to be simple.

SANGED commented 6 years ago

@Zeeker the concern is that it would be just a little more interesting feature to see the 2 versions left and right, I do not know but I do not see how it would be so complex to develop