{"push_id":923613899,"size":2,"distinct_size":2,"ref":"refs/heads/build-pkg-only-deps","head":"8063be2e3ae798ed508fe177b80741d366e08bb0","before":"1f43fc0349ca55a03e0aca0d52b51b7191f6599f","commits":[{"sha":"9ef7029046c9cdb77e504f82c46cbe5175f47700","author":{"email":"5e0a256ed432d4a5744301f59c3086205217a1b5@gmail.com","name":"Boris Nagaev"},"message":"build-pkg: merge \"resolves\" conflicts\n\nResult of build by previous commit:\nhttps://gist.github.com/32309209c467853deedc\n\nIf a conflict happens, build-pkg should \"resolve\" it by selecting\none of versions. Git has a merge strategy \"recursive\" with an\noption \"ours\" which does exactly what is needed but works only\nfor two heads. That is why multi-merge was replaced by multiple\nmerges of two heads.","distinct":true,"url":"https://api.github.com/repos/LuaAndC/mxe/commits/9ef7029046c9cdb77e504f82c46cbe5175f47700"},{"sha":"8063be2e3ae798ed508fe177b80741d366e08bb0","author":{"email":"5e0a256ed432d4a5744301f59c3086205217a1b5@gmail.com","name":"Boris Nagaev"},"message":"build-pkg: make sure checkout and merge succeed","distinct":true,"url":"https://api.github.com/repos/LuaAndC/mxe/commits/8063be2e3ae798ed508fe177b80741d366e08bb0"}]}