Merge conflict is shown when edits are done on a different book

[elsylambert]

When two users working on two different files/books on en_tn, merge their work to master, the user user sees merge conflict and is not able to merge the work done until logging back in.

[birchamp]

@elsylambert This seems like a high priority that would happen often. Is that true?

[birchamp]

@kintsoogi and @theNerd247 are working on the merge process in gE right now and we should wait until they have a solution to see if it affects this.

[elsylambert]

@RevantCI Please test the case where you found the problem in branch merge.

[RevantCI]

Hi @elsylambert This is the issue that I had mentioned in our call yesterday https://github.com/Bridgeconn/uw-lab/blob/50d4ec9b188ff4f7d40be57738a108079366060e/dcs-branch-merger/README.md#checkdtbranchtousrbranch-this-is-not-working-properly In the DCS Merger RCL the CheckDtBranchToUsrBranch function does not work as the name suggests. However this function is not used by TC Create so don't think it can be tested in TC Create it can be tested in the RCL if required. Joel is the one who worked on this RCL POC, he can give the specifics steps for the issue as required here or in the RCL repo as a new issue.

[RevantCI]

We will be testing the issue #1609 fixed by Noah above on TC Create and updating it here soon.

[Joel-C-Johnson]

Accidentally closed this issue while adding a comment. I have reponed this issue.

[Joel-C-Johnson]

Hi @elsylambert This is the issue that I had mentioned in our call yesterday https://github.com/Bridgeconn/uw-lab/blob/50d4ec9b188ff4f7d40be57738a108079366060e/dcs-branch-merger/README.md#checkdtbranchtousrbranch-this-is-not-working-properly In the DCS Merger RCL the CheckDtBranchToUsrBranch function does not work as the name suggests. However this function is not used by TC Create so don't think it can be tested in TC Create it can be tested in the RCL if required. Joel is the one who worked on this RCL POC, he can give the specifics steps for the issue as required here or in the RCL repo as a new issue.

PR ScreenShot : dcs-branch-merger:

This function in the DCS branch merger RCL will help check if there are any updates in the master branch (as demonstrated in the RCL demo: "This demo is a test of checking for an update of the user branch from master."). Currently, it checks from the user branch to the master branch, but it should be the other way around—from master to the user branch. Additionally, if you look at the PR screenshot, it shows 'master << test-CV,' which I believe is incorrect. It should create a PR like 'test-CV << master,' which helps determine if the master branch has any changes.

[Joel-C-Johnson]

We will be testing the issue #1609 fixed by Noah above on TC Create and updating it here soon.

tested it with the latest release (1.4.1), and it works as expected.

Steps for editing different books:

• Login to tC create app in two browsers (use two credentials)
• select the same org, resource, and lang for both credentials
• select file TIT in one browser and PHM in another browser.
• edit both files and save, then merge the files. (Clicking "merge my work" from the dashboard)
• there are no conflict messages when we try to merge the files

Steps for editing same books:

• Login to tC create app in two browsers (use two credentials)
• select the same org, resource, and lang for both credentials
• select file TIT in both browsers.
• edit both files and save, then merge the files. (Clicking "merge my work" from the dashboard)
• there will be conflicts messages when we try to merge the files

[Joel-C-Johnson]

Hi @elsylambert , Tested and merged the issue PR to develop and moved to QA App

[elsylambert]

Works as expected in translationCore Create - v1.17 build 277-90c96ed.

• When edits are made by two different users in two different books, no conflict is seen. Changes can be merged to master.
• When edits are made by two different users in a same book but different rows, no conflict is seen. Changes can be merged to master.
• When edits are made by two different users in a same book and same row, conflict is seen. Changes cannot be merged to master. This works as expected behaviour.