In some cases we would need some portion of code from both varients line in Image below. How can we handle this case using EDIFF so that the final result will be
import { apple, banana, coconut } from 'fruits'
Asked
Active
Viewed 91 times
1
Bipin Manandhar
- 105
- 11
-
Got it, I can make an edit on Variant C, didn't know that – Bipin Manandhar May 09 '21 at 04:30
-
Be sure to *answer* your own question. You can then *accept* your answer. – phils May 11 '21 at 07:38
-
Also related: https://stackoverflow.com/questions/9656311/conflict-resolution-with-emacs-ediff-how-can-i-take-the-changes-of-both-version – phils May 11 '21 at 07:38