![]() ![]() That said, many repos are not large/active enough that you get these sort of implicit merge conflict, so rebasing is largely fine. This is easier to resolve than trying to understand how someone got it wrong in the first place. If I can see that just before a real merge commit that the code worked, but after it, it did not, I can make the reasonable assumption that the bug was caused by parallel development not agreeing. Now, I don't really care if people think I can't code, but what I really want is to be able to understand the code. It just looks like you can't code and you started with a mistake. This means if the implicit merge introduces problems, it is not apparent it came from the "merge". When you rebase, you implicitly "merge" a branch into yours, but it gets hidden and it looks like you started from a different point. ![]()
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |