Re: What's your preferred way to merge changes and manage conflicts in LyX files under git?

On Thu, Apr 20, 2017 at 9:23 AM, Cris Fuhrman wrote: > I have configured SourceTree to use the kdiff3 tool, which did a great job > to help me out (it resolved most of the conflicts, but about 20% required > manual intervention, where you basically have to decide between

Re: What's your preferred way to merge changes and manage conflicts in LyX files under git?

On Thu, Apr 20, 2017 at 11:23:21AM -0400, Cris Fuhrman wrote: > I'm collaborating using git on bitbucket (for a free private cloud > repository) and SourceTree for Windows on an article in LyX (2.2.2). There > are multiple image files (e.g., generated by R in SVG) and a big .bib file. > For the