Update content shows conflict in en_tn when edits are made in a different book

[elsylambert]

Update content shows conflict in en_tn when edits are made in a different book. Steps:

1. Open tCC>en_tn>edit a file(e.g Mathew)
2. Save the edits and logout.
3. Open GE> navigate to Titus> on TN card. note that Update my content icon has a 🔴 red dot. Click on it and it will show Conflict error.
4. Go to hamburger menu>Merge to master>select tN. The merge happens and the Update my content icon 🔴 red dot is gone.

Conflict Error should not show for a different book.

[kintsoogi]

@elsylambert Is this the issue where dcs-branch-merger is returning a false conflict?

[kintsoogi]

I found that the false conflict usually happens on a bigger book (like Matthew). Specifically, this happens when the user is in the book on Gateway Edit. The change doesn't necessarily have to be in a bigger book, but if the user has navigated to a bigger book in Gateway Edit, then this issue happens.

[kintsoogi]

This is just hard to test because it's MOODY

[kintsoogi]

@elsylambert @danielklapp Just merged in the changes to fix false conflict on merge/update! The only thing is that there is a chance on save for the false conflict, but I can't fix that in the app unless I set a very long delay which would be undesirable. Hopefully the future changes to gitea help

Describe what your pull request addresses

• [ ] Fixes gEdit issue #528 - merge false conflict on update/merge

Test Instructions

• [ ] Open Deploy Preview
• [ ] Make changes and test update/merge to make sure they do not return false conflicts

[elsylambert]

Verified in v2.1.0 build 34af947 QA. Edits made to en_tn are not showing conflicts when they are made in different books. When edits are made to same book and same note, the red dot is indicated and conflict error is shown, which is the expected behaviour. Looks good.

[danielklapp]

Agree when editing two different books in en_tn, conflicts aren’t shown. Working properly in v2.1.0 build 10ae431 QA.