search

unfoldingWord / tc-create-app

translationCore Create
https://create.translationcore.com/
MIT License
0 stars 5 forks source link

Dcs update #1633

Closed theNerd247 closed 7 months ago

theNerd247 commented 7 months ago

updates dcs-branch-merger to 1.4.1

elsylambert commented 7 months ago

@Joel-C-Johnson Can you update this?

elsylambert commented 7 months ago

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

Joel-C-Johnson commented 7 months ago

@Joel-C-Johnson Can you update this?

I have tested the issue with @LijuJacob08 locally with 1.4.1 (dcs-branch-merger rcl ), and we didn't face the issue. I have put a comment on the issue regarding it. https://github.com/unfoldingWord/tc-create-app/issues/1609#issuecomment-1840637998

RevantCI commented 7 months ago

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

Hi Elsy, had asked Joel to test and comment about the issue in the #1609 dcs merge conflict issue. Here is the link to the comment where Joel has explained it. https://github.com/unfoldingWord/tc-create-app/issues/1609#issuecomment-1840586863

Joel-C-Johnson commented 7 months ago

Resolved the PR conflicts. Then me and @RevantCI tested with deploy preview link it's working fine for different books but same books same row changes its showing conflicts as expected. Merging the PR.