On Sun, Oct 15, 2023 at 08:27:44PM +0200, Markus Oppmann wrote: > Just wanted to share with you how it's possible to use the compare feature > of LyX to resolve git merge conflicts by registering LyX as a merge tool for > git:
Interesting indeed. > When finished, you need to override the conflicted file with the generated > changes1.lyx file, close the LyX window and confirm to git that the merge > was successful. I think it would be quite easy to enhance our lfuns, so this last "override the conflicted file with the generated changes1.lyx file" is also automatic. Maybe it's possible even now with command-sequence lfun? > (By the way there is bug item #8440 <https://www.lyx.org/trac/ticket/8440> > requesting such a function. Wanted to add this as comment, but i don't have > an account in the bug tracker yet and it seems like registering is disabled) I am happy to create an account for you if there is an interest. > Should i write about this in the LyX Wiki? Where would be a good place for > it? This one looks good... :https://wiki.lyx.org/Devel/Collaboration#toc6 BTW beware that comparison function in LyX is not without issues: https://www.lyx.org/trac/ticket/9395 https://www.lyx.org/trac/ticket/9048 https://www.lyx.org/trac/ticket/6889 Pavel -- lyx-users mailing list lyx-users@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-users
