{"action":"opened","issue":{"url":"https://api.github.com/repos/AltGr/Camelus/issues/22","repository_url":"https://api.github.com/repos/AltGr/Camelus","labels_url":"https://api.github.com/repos/AltGr/Camelus/issues/22/labels{/name}","comments_url":"https://api.github.com/repos/AltGr/Camelus/issues/22/comments","events_url":"https://api.github.com/repos/AltGr/Camelus/issues/22/events","html_url":"https://github.com/AltGr/Camelus/issues/22","id":321593855,"number":22,"title":"Use the 'resolve' merge stategy for the automatic merges to the 2.0.0 branch","user":{"login":"kit-ty-kate","id":2611789,"avatar_url":"https://avatars2.githubusercontent.com/u/2611789?v=4","gravatar_id":"","url":"https://api.github.com/users/kit-ty-kate","html_url":"https://github.com/kit-ty-kate","followers_url":"https://api.github.com/users/kit-ty-kate/followers","following_url":"https://api.github.com/users/kit-ty-kate/following{/other_user}","gists_url":"https://api.github.com/users/kit-ty-kate/gists{/gist_id}","starred_url":"https://api.github.com/users/kit-ty-kate/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/kit-ty-kate/subscriptions","organizations_url":"https://api.github.com/users/kit-ty-kate/orgs","repos_url":"https://api.github.com/users/kit-ty-kate/repos","events_url":"https://api.github.com/users/kit-ty-kate/events{/privacy}","received_events_url":"https://api.github.com/users/kit-ty-kate/received_events","type":"User","site_admin":false},"labels":[],"state":"open","locked":false,"assignee":null,"assignees":[],"milestone":null,"comments":0,"created_at":"2018-05-09T14:28:43Z","updated_at":"2018-05-09T14:28:43Z","closed_at":null,"author_association":"NONE","body":"This strategy seems to work every time (at least twice so far) a conflict arises when Camelus is trying to merge new commits + transformations to the 2.0 format to the 2.0.0 branch.\r\nI couldn't find the merge command in the code so I'm not sure how to incorporate this but here are my two cents.\r\n\r\nSee #11943 or https://github.com/ocaml/opam-repository/pull/11877#issuecomment-384943910 for instance"}}
{"actor":{"display_login":"kit-ty-kate"}}