{"action":"created","issue":{"url":"https://api.github.com/repos/worldofbalance/unity-game-client/issues/18","repository_url":"https://api.github.com/repos/worldofbalance/unity-game-client","labels_url":"https://api.github.com/repos/worldofbalance/unity-game-client/issues/18/labels{/name}","comments_url":"https://api.github.com/repos/worldofbalance/unity-game-client/issues/18/comments","events_url":"https://api.github.com/repos/worldofbalance/unity-game-client/issues/18/events","html_url":"https://github.com/worldofbalance/unity-game-client/issues/18","id":145339800,"number":18,"title":"Can't merge changes to World.unity scene","user":{"login":"Fito","id":702401,"avatar_url":"https://avatars.githubusercontent.com/u/702401?v=3","gravatar_id":"","url":"https://api.github.com/users/Fito","html_url":"https://github.com/Fito","followers_url":"https://api.github.com/users/Fito/followers","following_url":"https://api.github.com/users/Fito/following{/other_user}","gists_url":"https://api.github.com/users/Fito/gists{/gist_id}","starred_url":"https://api.github.com/users/Fito/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Fito/subscriptions","organizations_url":"https://api.github.com/users/Fito/orgs","repos_url":"https://api.github.com/users/Fito/repos","events_url":"https://api.github.com/users/Fito/events{/privacy}","received_events_url":"https://api.github.com/users/Fito/received_events","type":"User","site_admin":false},"labels":[{"url":"https://api.github.com/repos/worldofbalance/unity-game-client/labels/help%20wanted","name":"help wanted","color":"159818"},{"url":"https://api.github.com/repos/worldofbalance/unity-game-client/labels/question","name":"question","color":"cc317c"}],"state":"open","locked":false,"assignee":null,"milestone":null,"comments":1,"created_at":"2016-04-02T05:48:42Z","updated_at":"2016-04-02T05:51:57Z","closed_at":null,"body":"@worldofbalance/integration @jensvdh \r\n@danamuise has done a lot of wonderful UI work on the lobby, and I'm trying to merge it into development. However, since scenes are binary files, I'm unable to resolve merge conflicts.\r\nI tried running 'git checkout --ours <filename>' but that does not seem to work. And even if it did, I don't think we want to keep only Dana's changes to the scene, since other people might have added something. Keeping development's version gets rid of his UI changes.\r\nSo I'm really stuck on this one. I found online that people use [this](http://docs.unity3d.com/Manual/SmartMerge.html) to merge Scenes. I tried it but it didn't seem to work either. (maybe I'm doing it wrong?)\r\n\r\nAny ideas? "},"comment":{"url":"https://api.github.com/repos/worldofbalance/unity-game-client/issues/comments/204652134","html_url":"https://github.com/worldofbalance/unity-game-client/issues/18#issuecomment-204652134","issue_url":"https://api.github.com/repos/worldofbalance/unity-game-client/issues/18","id":204652134,"user":{"login":"Fito","id":702401,"avatar_url":"https://avatars.githubusercontent.com/u/702401?v=3","gravatar_id":"","url":"https://api.github.com/users/Fito","html_url":"https://github.com/Fito","followers_url":"https://api.github.com/users/Fito/followers","following_url":"https://api.github.com/users/Fito/following{/other_user}","gists_url":"https://api.github.com/users/Fito/gists{/gist_id}","starred_url":"https://api.github.com/users/Fito/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Fito/subscriptions","organizations_url":"https://api.github.com/users/Fito/orgs","repos_url":"https://api.github.com/users/Fito/repos","events_url":"https://api.github.com/users/Fito/events{/privacy}","received_events_url":"https://api.github.com/users/Fito/received_events","type":"User","site_admin":false},"created_at":"2016-04-02T05:51:57Z","updated_at":"2016-04-02T05:51:57Z","body":"This is the branch that has Dana's changes: lby-ui-work"}}