{"action":"opened","issue":{"url":"https://api.github.com/repos/unfoldingWord-dev/ts-android/issues/1316","repository_url":"https://api.github.com/repos/unfoldingWord-dev/ts-android","labels_url":"https://api.github.com/repos/unfoldingWord-dev/ts-android/issues/1316/labels{/name}","comments_url":"https://api.github.com/repos/unfoldingWord-dev/ts-android/issues/1316/comments","events_url":"https://api.github.com/repos/unfoldingWord-dev/ts-android/issues/1316/events","html_url":"https://github.com/unfoldingWord-dev/ts-android/issues/1316","id":138283721,"number":1316,"title":"Handle merge conflicts when publishing a translation","user":{"login":"RRohrssen","id":15789352,"avatar_url":"https://avatars.githubusercontent.com/u/15789352?v=3","gravatar_id":"","url":"https://api.github.com/users/RRohrssen","html_url":"https://github.com/RRohrssen","followers_url":"https://api.github.com/users/RRohrssen/followers","following_url":"https://api.github.com/users/RRohrssen/following{/other_user}","gists_url":"https://api.github.com/users/RRohrssen/gists{/gist_id}","starred_url":"https://api.github.com/users/RRohrssen/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/RRohrssen/subscriptions","organizations_url":"https://api.github.com/users/RRohrssen/orgs","repos_url":"https://api.github.com/users/RRohrssen/repos","events_url":"https://api.github.com/users/RRohrssen/events{/privacy}","received_events_url":"https://api.github.com/users/RRohrssen/received_events","type":"User","site_admin":false},"labels":[],"state":"open","locked":false,"assignee":null,"milestone":null,"comments":0,"created_at":"2016-03-03T20:06:37Z","updated_at":"2016-03-03T20:06:37Z","closed_at":null,"body":"When publishing to the server we must first perform a pull to get any pending changes. If there was a merge conflict we need to display a notice to the user with the following options:\r\n\r\n* Review conflicts - takes them back to their translation where they can view the conflicts\r\n* Use my changes - favors the users changes and continues to push\r\n* Cancel - rolls back the merge that resulted from the pull request\r\n\r\n> NOTE: it would be nice to have a shortcut for jumping to the next/previous merge conflict while in the translate mode.\r\n\r\nSee https://github.com/unfoldingWord-dev/ts-requirements/issues/30 for more details"}}