Ft/offline text merge

[sijumoncy]

• FIXED Offline Merge for Text Translation Projects #98
• Offline Merge Feature for Text Translation
• Merge Option available on Import Existing Project ( Flavour Text Translation )
• The Merge Can be resumed later from the check point ( Check Point will be the completion of each chapter. The system will only take care of chapter by chapter . You can not stop and continue from middle of a chapter )
• The merge will be corrupted if back end data is modified / removed manually. Can not be restored
• You can merge to the actual content / project book by book on completion of entire conflict of the book.
• One commit will be created on merge start with all the changes before the merge ( timestamp and commit message can be used to identify the commit)
• One commit will be created on resolving each book with all the merged changes of the book ( timestamp and commit message can be used to identify)
• This commit can be used to revert back to earlier stage ( advanced option )
• Can not re work on chapter or book once you finish the conflicts with book / chapter
• User have provision to continue or start over the merge process at any point
• If you merge a book by completing all conflict , the original data will be replaced by the merge content. This can not be reverted.
• metadata.json of original project will be updated with new USFM's metadata on finish merge conflict of book.
• Grammar USFM to PERF USFM conversion added to generate USFM similar to the editor saves.
• Conflicts
  • Different contents on Original and New will be a conflict
  • If the New have a valid content ( a-zA-z0-9 ) and original have any content will be a conflict
• Merge UI ( options)
  • Accept all new changes
  • Keep All existing changes
  • Revert All changes
  • Accept single changes ( current or new )
  • Chapter Completion ( Check point )
  • Merge Conflict Completion ( on completion : replace the original USFM with new merge USFM )

[selvabenz]

• Offline Merge Feature for Text Translation

• Merge Option available on Import Existing Project ( Flavour Text Translation )

• The Merge Can be resumed later from the check point ( Check Point will be the completion of each chapter. The system will only take care of chapter by chapter . You can not stop and continue from middle of a chapter )

• The merge will be corrupted if back end data is modified / removed manually. Can not be restored

• One commit will be created on merge start with all the changes before the merge ( timestamp and commit message can be used to identify the commit)

• One commit will be created after the merge with all the merged changes ( timestamp and commit message can be used to identify)

• This commit can be used to revert back to earlier stage ( advanced option )

• Can not re work on chapter or book once you finish the conflicts with book / chapter
  updating metadata.json with new USFM's metadata on finish merge conflict for entire project

  • Merge UI ( options)
  • Accept all new changes
  • Keep All existing changes
  • Revert All changes
  • Accept single changes ( current or new )
  • Chapter Completion ( Check point )
  • Merge Conflict Completion ( on completion : replace the original USFM with new merge USFM )