@hdcola 嗯嗯，以前用过。我这个解决方法挺简单，git merge就行啦（
QOTO: Question Others to Teach Ourselves An inclusive, Academic Freedom, instance All cultures welcome. Hate speech and harassment strictly forbidden.
