{"action":"created","issue":{"url":"https://api.github.com/repos/openstreetmap/iD/issues/2525","labels_url":"https://api.github.com/repos/openstreetmap/iD/issues/2525/labels{/name}","comments_url":"https://api.github.com/repos/openstreetmap/iD/issues/2525/comments","events_url":"https://api.github.com/repos/openstreetmap/iD/issues/2525/events","html_url":"https://github.com/openstreetmap/iD/pull/2525","id":57224587,"number":2525,"title":"Conflict resolution","user":{"login":"samanpwbb","id":108094,"avatar_url":"https://avatars.githubusercontent.com/u/108094?v=3","gravatar_id":"","url":"https://api.github.com/users/samanpwbb","html_url":"https://github.com/samanpwbb","followers_url":"https://api.github.com/users/samanpwbb/followers","following_url":"https://api.github.com/users/samanpwbb/following{/other_user}","gists_url":"https://api.github.com/users/samanpwbb/gists{/gist_id}","starred_url":"https://api.github.com/users/samanpwbb/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/samanpwbb/subscriptions","organizations_url":"https://api.github.com/users/samanpwbb/orgs","repos_url":"https://api.github.com/users/samanpwbb/repos","events_url":"https://api.github.com/users/samanpwbb/events{/privacy}","received_events_url":"https://api.github.com/users/samanpwbb/received_events","type":"User","site_admin":false},"labels":[],"state":"open","locked":false,"assignee":null,"milestone":null,"comments":5,"created_at":"2015-02-10T19:35:35Z","updated_at":"2015-03-04T20:19:35Z","closed_at":null,"pull_request":{"url":"https://api.github.com/repos/openstreetmap/iD/pulls/2525","html_url":"https://github.com/openstreetmap/iD/pull/2525","diff_url":"https://github.com/openstreetmap/iD/pull/2525.diff","patch_url":"https://github.com/openstreetmap/iD/pull/2525.patch"},"body":"Reroll of https://github.com/bhousel/iD/pull/2\r\n\r\nThis branch reworks the conflict resolution UI:\r\n![2015-02-10 13_35_08](https://cloud.githubusercontent.com/assets/108094/6133684/a83ff14c-b129-11e4-952f-c9e036162d24.gif)\r\n\r\n- Moved the conflict resolution UI out of a modal and into a sidebar overlay\r\n- Clicking on conflicting features centers +highlights features.\r\n- After resolving one feature, next feature is automatically highlighted.\r\n- Save button is disabled until all conflicts are resolved.\r\n\r\nIn addition, I couldn't restrain myself from righting some design/css wrongs a younger version of myself made a couple years ago in iD.\r\n\r\n@bhousel could you give this a review? Let me know what you think of the design adjustments, and I wouldn't be surprised if the code could be significantly cleaned up, I'm not that experienced with D3.\r\n\r\ncc: @jfirebaugh @aaronlidman"},"comment":{"url":"https://api.github.com/repos/openstreetmap/iD/issues/comments/77238477","html_url":"https://github.com/openstreetmap/iD/pull/2525#issuecomment-77238477","issue_url":"https://api.github.com/repos/openstreetmap/iD/issues/2525","id":77238477,"user":{"login":"tristen","id":61150,"avatar_url":"https://avatars.githubusercontent.com/u/61150?v=3","gravatar_id":"","url":"https://api.github.com/users/tristen","html_url":"https://github.com/tristen","followers_url":"https://api.github.com/users/tristen/followers","following_url":"https://api.github.com/users/tristen/following{/other_user}","gists_url":"https://api.github.com/users/tristen/gists{/gist_id}","starred_url":"https://api.github.com/users/tristen/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/tristen/subscriptions","organizations_url":"https://api.github.com/users/tristen/orgs","repos_url":"https://api.github.com/users/tristen/repos","events_url":"https://api.github.com/users/tristen/events{/privacy}","received_events_url":"https://api.github.com/users/tristen/received_events","type":"User","site_admin":false},"created_at":"2015-03-04T20:19:35Z","updated_at":"2015-03-04T20:19:35Z","body":"Awesome!!"}}