![]() ![]() ![]() In this case, I would always recommend the ‘Pull with rebase’ approach. With shared branches, several people commit to the same branch, and they find that when pushing, they get an error indicating that someone else has pushed first. To explore this further, let’s say you work in a development team with many committers, and that your team uses both shared branches as well as personal feature branches. Looking at the above pros/cons, it’s clear that it’s generally not a case of choosing between one or the other, but more a case of using each at the appropriate times. If anyone else checks out that branch and you later rebase it, it’s going to get very confusing. In Git, you may push commits you may want to rebase later (as a backup) but only if it’s to a remote branch that only you use. In Mercurial, you simply cannot push commits that you later intend to rebase, because anyone pulling from the remote will get them.
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |