{"push_id":2734650427,"size":7,"distinct_size":0,"ref":"refs/heads/dev","head":"31d4353437801e16d567bdd2280b0aeab993c319","before":"c196e3afa424134a799f46d44062a7d888b33a4f","commits":[{"sha":"4012258e68e17c221d214919e5488a6e78669e99","author":{"name":"Artsiom Valchanin","email":"d209e3cc26f2f9b21f0281355f35806aa9bad863@gmail.com"},"message":"Move conflict resolution to the separate folder","distinct":false,"url":"https://api.github.com/repos/sedrozdova/ggrc-core/commits/4012258e68e17c221d214919e5488a6e78669e99"},{"sha":"5b7698125d57cf35154a3c8df251212a5fd8bd2f","author":{"name":"Artsiom Valchanin","email":"d209e3cc26f2f9b21f0281355f35806aa9bad863@gmail.com"},"message":"Add conflict resolution for Custom Attributes","distinct":false,"url":"https://api.github.com/repos/sedrozdova/ggrc-core/commits/5b7698125d57cf35154a3c8df251212a5fd8bd2f"},{"sha":"5c154a3a2e78a1a2ed0086691901cc2e118f5fa5","author":{"name":"Artsiom Valchanin","email":"d209e3cc26f2f9b21f0281355f35806aa9bad863@gmail.com"},"message":"Add conflict resolution for attribute_object field","distinct":false,"url":"https://api.github.com/repos/sedrozdova/ggrc-core/commits/5c154a3a2e78a1a2ed0086691901cc2e118f5fa5"},{"sha":"6256de0a8e277d0ace23227d0456acb945d92d0b","author":{"name":"Artsiom Valchanin","email":"d209e3cc26f2f9b21f0281355f35806aa9bad863@gmail.com"},"message":"Use common error message in GCA inline edit","distinct":false,"url":"https://api.github.com/repos/sedrozdova/ggrc-core/commits/6256de0a8e277d0ace23227d0456acb945d92d0b"},{"sha":"1e26c0d739635b7ecfd35bd6df15e73299c97a0b","author":{"name":"Artsiom Valchanin","email":"d209e3cc26f2f9b21f0281355f35806aa9bad863@gmail.com"},"message":"Set checkbox value in correct format.\n\nBackend is using string and we used number.\n'1' !== 1 and it causes conflicts in some cases.","distinct":false,"url":"https://api.github.com/repos/sedrozdova/ggrc-core/commits/1e26c0d739635b7ecfd35bd6df15e73299c97a0b"},{"sha":"7ec3356609e54e70e466a3a80d528f55781abca6","author":{"name":"Artsiom Valchanin","email":"d209e3cc26f2f9b21f0281355f35806aa9bad863@gmail.com"},"message":"Backup instance after update.","distinct":false,"url":"https://api.github.com/repos/sedrozdova/ggrc-core/commits/7ec3356609e54e70e466a3a80d528f55781abca6"},{"sha":"31d4353437801e16d567bdd2280b0aeab993c319","author":{"name":"Roman Matusevich","email":"6d32f5a5a48605d59e65dcf5392aa84e3a5bc227@gmail.com"},"message":"Merge pull request #8079 from valchanin/ggrc-3743\n\nGGRC-3743/GGRC-3745 Conflict resolution for Custom Attributes","distinct":false,"url":"https://api.github.com/repos/sedrozdova/ggrc-core/commits/31d4353437801e16d567bdd2280b0aeab993c319"}]}
{"actor":{"display_login":"sedrozdova"}}