u/pluto124

I'm able to use the cli version of kimi, but if I try to login on the web it want's a phone number and there is no +1 choice. Just +86 for China.

Is there a way to do a git merge in Zed? If there is, is there conflict resolution? I saw a conflict resolution section in the docs, but there is no mention of how to do a merge.