Morning All,

it's currently 10:25 UK time. My emails to the list seem to be taking a few days to get to the docs list at the moment, so I've no idea if or when you will see this!

I've updated the gfix manual to resolve issue DOC-129 whereby the sweep interval was incorrectly defined.

I've raised a pull request from my specially created branch DOC-129 for the resolution.

While I am able to merge this fix into master, I cannot merge it into B_release though. I get the impression that B_Release either didn't come across correctly, or is too far out of date from Master as attempting to merge my DOC-129 branch into B_release gives lots of conflict errors.

$git merge DOC-129

Auto-merging src/docs/refdocs/refdocs.xml
CONFLICT (content): Merge conflict in src/docs/refdocs/refdocs.xml

Auto-merging src/docs/refdocs/langref/langrefupd25.xml
CONFLICT (content): Merge conflict in src/docs/refdocs/langref/langrefupd25.xml

Auto-merging src/docs/refdocs/langref/langrefupd21.xml
CONFLICT (content): Merge conflict in src/docs/refdocs/langref/langrefupd21.xml

Removing src/docs/refdocs/langref/langref25.xml

Auto-merging src/docs/papers/firebird_php_linux.xml
CONFLICT (content): Merge conflict in src/docs/papers/firebird_php_linux.xml

Auto-merging src/docs/papers/firebird_enterprise.xml
CONFLICT (content): Merge conflict in src/docs/papers/firebird_enterprise.xml

Auto-merging src/docs/firebirddocs/ubuntu-setup.xml
CONFLICT (content): Merge conflict in src/docs/firebirddocs/ubuntu-setup.xml

Auto-merging src/docs/firebirddocs/quickstartguide-3.xml
CONFLICT (add/add): Merge conflict in src/docs/firebirddocs/quickstartguide-3.xml

Auto-merging src/docs/firebirddocs/quickstartguide-2.5.xml

Auto-merging src/docs/firebirddocs/fbutil_isql.xml
CONFLICT (content): Merge conflict in src/docs/firebirddocs/fbutil_isql.xml

Auto-merging src/docs/firebirddocs/fbutil_gfix.xml
CONFLICT (content): Merge conflict in src/docs/firebirddocs/fbutil_gfix.xml

Auto-merging src/docs/firebirddocs/docbuilding-howto.xml
CONFLICT (content): Merge conflict in src/docs/firebirddocs/docbuilding-howto.xml

Removing ChangeLog
Automatic merge failed; fix conflicts and then commit the result.

Git status gives screens and screens of new files to be added, and 9 modified files, from the 10 files listed above, to have their conflicts fixed.

Listed above is fbutils_gfix.xml but it isn't listed in the git status output as a conflicting file. Oh joy! It also doesn't have any conflict markers.

$git merge --abort cleaned up the mess from the merge.

The same happens if I experiment with merging master into B_Release (in my local copy of my fork - so no damage done!) Another --abort cleaned up there too.

Has anyone else been able to merge new documents or changes into B_Release?


Norman Dunbar
Dunbar IT Consultants Ltd

Registered address:
27a Lidget Hill
West Yorkshire
United Kingdom
LS28 7LG

Company Number: 05132767

Check out the vibrant tech community on one of the world's most
engaging tech sites,!
Firebird-docs mailing list

Reply via email to