Git工作流程和rebase与合并问题
问题: I've been using Git now for a couple of months on a project with one other developer. 我和其他开发人员一起在一个项目上使用Git几个月了。 I have several years of experience with SVN , so I guess I bring a lot of baggage to the relationship. 我有几年的 SVN 经验,所以我想我给这段关系带来了很多包袱。 I have heard that Git is excellent for branching and merging, and so far, I just don't see it. 我听说Git非常适合分支和合并,到目前为止,我只是没有看到它。 Sure, branching is dead simple, but when I try to merge, everything goes all to hell. 当然,分支很简单,但是当我尝试合并时,一切都变得很糟糕。 Now, I'm used to that from SVN, but it seems to me that I just traded one sub-par versioning system for