I'm using doom emacs + magit, and it enables smerge for me to display nicely my conflicts. I just saw that smerge has a function
smerge-resolve to automatically resolve conflicts. I'd like to use it on "typical" conflicts I get in LaTeX: for example I add a word at the beginning of the sentence, and my co-author removes a typo at the end of the sentence.
However, the default command does not work for that case. Is it possible to automatically resolve that kind of conflicts?