Re: [be] yet another bibledit-git patch

[Teus Benschop]

Hi David,

There are a few settings that affect the handling of conflicts in case
these occur during a git pull.

There are the following ones:

File projectconfig.h/cpp have a variable
git_remote_repository_conflict_handling. This sets what happens when a
conflict occurs. Either it takes the text as it is on the local
computer, or it takes the text as it is on the server that hosts the git
repository.

When the user opens a chapter that has a conflict, while opening this
chapter, bibledit-gtk notices this conflict, and immediately resolves
it. It does this according to the policy as set in the variable
git_remote_repository_conflict_handling. The code for loading a chapter
is in function project_retrieve_chapter, found in file
projectutils.h/cpp. This calls function git_resolve_conflict_chapter.
This function is in file git.h/cpp.

Thus the conflict is not handled at the time it occurs, but at the time
the chapter is loaded into the editor.

About the merging tools, if these are not installed, then there is a
problem.

I'll just await any patches you might have for addressing the issues
mentioned.

Regards,

Teus.