Add test case for merge conflicts in gg update #96
Description
I've manually tested that the behavior of gg update with merge conflicts is to succeed, but it would be good to have a test case that checks this behavior.
{{ message }}
I've manually tested that the behavior of gg update with merge conflicts is to succeed, but it would be good to have a test case that checks this behavior.