5/17/2023 0 Comments Re pull from a master git![]() ![]() ![]() At this point I always do a pull -rebase. You are in your work → commit → work → commit cycle, and when you decide to push your work your push is rejected, because there's been parallel work on the same branch. I think you should use git pull -rebase when collaborating with others on the same branch. The key point is that Alice & Bob are simultaneously merging their local branches to a shared remote branch. Master in this example could just as easily be a release branch or dev branch. Note that the specific branch being merged into is irrelevant to the example.
0 Comments
Leave a Reply. |