我不会用git
@fulkrum 使用github desktop，相当不错的GUI
@hdcola 嗯嗯，以前用过。我这个解决方法挺简单，git merge就行啦（
CleverLibre Social is an inclusive social instance for open discussion, learning, and community. All cultures welcome. Hate speech and harassment strictly forbidden.
