On Wednesday, April 1, 2020 at 5:34:20 AM UTC-5, Edward K. Ream wrote: > > Somehow it contains many conflict markers from a git merge. >
It should be easy for you. From a branch that contains your desired vr3.py: - git merge devel (Will likely create a merge conflict). - git checkout --ours leo\plugins\viewrendered3.py - git add . - git checkout devel - git merge <your branch> - git push Edward -- You received this message because you are subscribed to the Google Groups "leo-editor" group. To unsubscribe from this group and stop receiving emails from it, send an email to leo-editor+unsubscr...@googlegroups.com. To view this discussion on the web visit https://groups.google.com/d/msgid/leo-editor/074ac984-8ea5-441c-a0b4-ec948604da9e%40googlegroups.com.
