{"action":"created","issue":{"url":"https://api.github.com/repos/WtfJoke/rtc2git/issues/7","labels_url":"https://api.github.com/repos/WtfJoke/rtc2git/issues/7/labels{/name}","comments_url":"https://api.github.com/repos/WtfJoke/rtc2git/issues/7/comments","events_url":"https://api.github.com/repos/WtfJoke/rtc2git/issues/7/events","html_url":"https://github.com/WtfJoke/rtc2git/issues/7","id":58458489,"number":7,"title":"Conflicts and outgoing changes","user":{"login":"WtfJoke","id":7139697,"avatar_url":"https://avatars.githubusercontent.com/u/7139697?v=3","gravatar_id":"","url":"https://api.github.com/users/WtfJoke","html_url":"https://github.com/WtfJoke","followers_url":"https://api.github.com/users/WtfJoke/followers","following_url":"https://api.github.com/users/WtfJoke/following{/other_user}","gists_url":"https://api.github.com/users/WtfJoke/gists{/gist_id}","starred_url":"https://api.github.com/users/WtfJoke/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/WtfJoke/subscriptions","organizations_url":"https://api.github.com/users/WtfJoke/orgs","repos_url":"https://api.github.com/users/WtfJoke/repos","events_url":"https://api.github.com/users/WtfJoke/events{/privacy}","received_events_url":"https://api.github.com/users/WtfJoke/received_events","type":"User","site_admin":false},"labels":[{"url":"https://api.github.com/repos/WtfJoke/rtc2git/labels/bug","name":"bug","color":"fc2929"},{"url":"https://api.github.com/repos/WtfJoke/rtc2git/labels/help%20wanted","name":"help wanted","color":"159818"}],"state":"open","locked":false,"assignee":{"login":"WtfJoke","id":7139697,"avatar_url":"https://avatars.githubusercontent.com/u/7139697?v=3","gravatar_id":"","url":"https://api.github.com/users/WtfJoke","html_url":"https://github.com/WtfJoke","followers_url":"https://api.github.com/users/WtfJoke/followers","following_url":"https://api.github.com/users/WtfJoke/following{/other_user}","gists_url":"https://api.github.com/users/WtfJoke/gists{/gist_id}","starred_url":"https://api.github.com/users/WtfJoke/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/WtfJoke/subscriptions","organizations_url":"https://api.github.com/users/WtfJoke/orgs","repos_url":"https://api.github.com/users/WtfJoke/repos","events_url":"https://api.github.com/users/WtfJoke/events{/privacy}","received_events_url":"https://api.github.com/users/WtfJoke/received_events","type":"User","site_admin":false},"milestone":null,"comments":9,"created_at":"2015-02-21T12:52:53Z","updated_at":"2015-03-29T20:17:37Z","closed_at":null,"body":"For some unknown reasons the rtc workspace contains conflicts and outgoing changes (despite the fact the skript doesnt check in anything in rtc) after the changes of the next stream gets accepted.\r\n\r\nThis issue should try to find the cause and/or triy to avoid such behaviour.\r\nI tried to fix this issue already by trying out different approaches, but until now I didnt found any solution.\r\n\r\nHowever this might be an issue of rtc itself... Somehow it seem it cant handle that.\r\n\r\nOne approach which should be tested is that the workspace gets compared directly with the baseline of the components of the headstream. This would result in a longer migration (each stream would get pulled up to the highest stream instead of branching of while pulling up)\r\n"},"comment":{"url":"https://api.github.com/repos/WtfJoke/rtc2git/issues/comments/87468711","html_url":"https://github.com/WtfJoke/rtc2git/issues/7#issuecomment-87468711","issue_url":"https://api.github.com/repos/WtfJoke/rtc2git/issues/7","id":87468711,"user":{"login":"WtfJoke","id":7139697,"avatar_url":"https://avatars.githubusercontent.com/u/7139697?v=3","gravatar_id":"","url":"https://api.github.com/users/WtfJoke","html_url":"https://github.com/WtfJoke","followers_url":"https://api.github.com/users/WtfJoke/followers","following_url":"https://api.github.com/users/WtfJoke/following{/other_user}","gists_url":"https://api.github.com/users/WtfJoke/gists{/gist_id}","starred_url":"https://api.github.com/users/WtfJoke/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/WtfJoke/subscriptions","organizations_url":"https://api.github.com/users/WtfJoke/orgs","repos_url":"https://api.github.com/users/WtfJoke/repos","events_url":"https://api.github.com/users/WtfJoke/events{/privacy}","received_events_url":"https://api.github.com/users/WtfJoke/received_events","type":"User","site_admin":false},"created_at":"2015-03-29T20:17:37Z","updated_at":"2015-03-29T20:17:37Z","body":"I found a workaround to get the history (user needs to provide it :clap: ) :)  \r\nFirst tests looks very promising. The changes get in the order they were delivered. "}}