{"comment":{"url":"https://api.github.com/repos/endlessm/pulseaudio/comments/11073570","html_url":"https://github.com/endlessm/pulseaudio/commit/1712f14411908cbcf86d81ff5a53fb4df2d776f7#commitcomment-11073570","id":11073570,"user":{"login":"mariospr","id":2197259,"avatar_url":"https://avatars.githubusercontent.com/u/2197259?v=3","gravatar_id":"","url":"https://api.github.com/users/mariospr","html_url":"https://github.com/mariospr","followers_url":"https://api.github.com/users/mariospr/followers","following_url":"https://api.github.com/users/mariospr/following{/other_user}","gists_url":"https://api.github.com/users/mariospr/gists{/gist_id}","starred_url":"https://api.github.com/users/mariospr/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/mariospr/subscriptions","organizations_url":"https://api.github.com/users/mariospr/orgs","repos_url":"https://api.github.com/users/mariospr/repos","events_url":"https://api.github.com/users/mariospr/events{/privacy}","received_events_url":"https://api.github.com/users/mariospr/received_events","type":"User","site_admin":false},"position":null,"line":null,"path":"","commit_id":"1712f14411908cbcf86d81ff5a53fb4df2d776f7","created_at":"2015-05-06T19:56:46Z","updated_at":"2015-05-06T19:56:46Z","body":"Thanks for your comments, Dan. To be clear, I do agree with you in the general case (which is what I did in other occasions) but here, in this particular situation, I do think it's a bit cleaner and easier to handle if I do it this way, as git-cherry would not be very clear after the merge, due to the conflicts.\r\n\r\nHopefully, next time we upgrade PA the merge will be clean right from the start and I won't feel the urge to do this hackish workaround again. Thanks for your understanding!"}}