{"action":"created","issue":{"url":"https://api.github.com/repos/unfoldingWord-dev/ts-desktop/issues/831","repository_url":"https://api.github.com/repos/unfoldingWord-dev/ts-desktop","labels_url":"https://api.github.com/repos/unfoldingWord-dev/ts-desktop/issues/831/labels{/name}","comments_url":"https://api.github.com/repos/unfoldingWord-dev/ts-desktop/issues/831/comments","events_url":"https://api.github.com/repos/unfoldingWord-dev/ts-desktop/issues/831/events","html_url":"https://github.com/unfoldingWord-dev/ts-desktop/issues/831","id":178131654,"number":831,"title":"Bug in displaying UI conflicts","user":{"login":"PhotoNomad0","id":14238574,"avatar_url":"https://avatars.githubusercontent.com/u/14238574?v=3","gravatar_id":"","url":"https://api.github.com/users/PhotoNomad0","html_url":"https://github.com/PhotoNomad0","followers_url":"https://api.github.com/users/PhotoNomad0/followers","following_url":"https://api.github.com/users/PhotoNomad0/following{/other_user}","gists_url":"https://api.github.com/users/PhotoNomad0/gists{/gist_id}","starred_url":"https://api.github.com/users/PhotoNomad0/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/PhotoNomad0/subscriptions","organizations_url":"https://api.github.com/users/PhotoNomad0/orgs","repos_url":"https://api.github.com/users/PhotoNomad0/repos","events_url":"https://api.github.com/users/PhotoNomad0/events{/privacy}","received_events_url":"https://api.github.com/users/PhotoNomad0/received_events","type":"User","site_admin":false},"labels":[{"url":"https://api.github.com/repos/unfoldingWord-dev/ts-desktop/labels/bug","name":"bug","color":"fc2929"}],"state":"open","locked":false,"assignee":null,"assignees":[],"milestone":null,"comments":1,"created_at":"2016-09-20T18:02:13Z","updated_at":"2016-09-23T20:26:25Z","closed_at":null,"body":"I found a bug in this merge case:\r\n\r\nIt fails rendering the following merge conflict:\r\n\r\n```\r\n \\v 1 1 Yo, Pablo, soy un preso que sirve a Cristo Jesús. Estoy aquí con Timoteo, nuestro hermano en la fe . Le escribo esta carta para usted, Filemón , nuestro querido amigo y compañero de trabajo . \\v 2 2 También me dirijo a Apia , nuestro hermano en la fe , ya Arquipo , que es como un soldado que sirve junto con nosotros. Y me dirijo al grupo de creyentes que se reúne en su casa. \\v 3 3 Rezo para que Dios nuestro Padre y nuestro Señor Jesucristo seguirá actuando amablemente hacia todos ustedes. Pido a Dios que él hacer que usted tenga paz.\r\n\r\n<<<<<<< HEAD\r\nlocal change 2\r\n=======\r\nremote change 4\r\n>>>>>>> branch 'master' of git@git.door43.org:photonomad0/es_phm_text_reg.git\"\r\n```\r\n\r\non ts-desktop I just see two panes with:\r\n\r\n`\\v 1 \\v 2 \\v 3 local change 2`\r\n\r\nand \r\n\r\n`\\v 1 \\v 2 \\v 3 remote change 2`\r\n\r\nIt looks like everything outside the merge conflict lines is thrown away.  If you select one pane and confirm, the loss of local text is permanent.\r\n\r\n**To reproduce this** using two devices:  First do a door43 restore of a project on both devices so they have a shared history.  Add a new line and some differing text to the end of the first chunk on each device.  On device 2, do and upload to door43.  Then on device 1, do an import (merge) from door43.  You will then see the conflict on device 1.  \r\n\r\n_**Note**_ - This only seems to be a problem if there is more than one line of text in the chunk.\r\n\r\n@cckozie \r\n"},"comment":{"url":"https://api.github.com/repos/unfoldingWord-dev/ts-desktop/issues/comments/249293960","html_url":"https://github.com/unfoldingWord-dev/ts-desktop/issues/831#issuecomment-249293960","issue_url":"https://api.github.com/repos/unfoldingWord-dev/ts-desktop/issues/831","id":249293960,"user":{"login":"cckozie","id":8171759,"avatar_url":"https://avatars.githubusercontent.com/u/8171759?v=3","gravatar_id":"","url":"https://api.github.com/users/cckozie","html_url":"https://github.com/cckozie","followers_url":"https://api.github.com/users/cckozie/followers","following_url":"https://api.github.com/users/cckozie/following{/other_user}","gists_url":"https://api.github.com/users/cckozie/gists{/gist_id}","starred_url":"https://api.github.com/users/cckozie/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/cckozie/subscriptions","organizations_url":"https://api.github.com/users/cckozie/orgs","repos_url":"https://api.github.com/users/cckozie/repos","events_url":"https://api.github.com/users/cckozie/events{/privacy}","received_events_url":"https://api.github.com/users/cckozie/received_events","type":"User","site_admin":false},"created_at":"2016-09-23T20:26:25Z","updated_at":"2016-09-23T20:26:25Z","body":"It appears that the significant factor is adding the line break. If I just add text at the end of the chunk without the new line it works fine. But...losing text is not acceptable!"}}
{"actor":{"display_login":"cckozie"}}