Mettez-vous hors ligne avec l'application Player FM !
Git Pull Causes a Merge
Manage episode 174376253 series 1401950
Author: Lorna Jane Mitchell
Read By: Lorna Jane Mitchell
Original Source: http://www.lornajane.net/posts/2015/git-pull-causes-a-merge
If you type git pull and expect a fast-forward update, but get a merge instead, don't panic! This usually happens when we're collaborating on a branch with other people, and we've made changes on our local version of a branch, and someone else (or the other you, if you use git to sync between multiple dev platforms) has made changes to the remote version of a branch in the meantime. It also happens really frequently in teams where all commits are to the master branch ... yet another reason to have a decent branching strategy.
🎉 Buy the book now it is 40% done https://bit.ly/php_llms
📰 Join the news letter https://sundance-solutions.mailcoach.app/php-and-llms
27 episodes
Manage episode 174376253 series 1401950
Author: Lorna Jane Mitchell
Read By: Lorna Jane Mitchell
Original Source: http://www.lornajane.net/posts/2015/git-pull-causes-a-merge
If you type git pull and expect a fast-forward update, but get a merge instead, don't panic! This usually happens when we're collaborating on a branch with other people, and we've made changes on our local version of a branch, and someone else (or the other you, if you use git to sync between multiple dev platforms) has made changes to the remote version of a branch in the meantime. It also happens really frequently in teams where all commits are to the master branch ... yet another reason to have a decent branching strategy.
🎉 Buy the book now it is 40% done https://bit.ly/php_llms
📰 Join the news letter https://sundance-solutions.mailcoach.app/php-and-llms
27 episodes
Tous les épisodes
×Bienvenue sur Lecteur FM!
Lecteur FM recherche sur Internet des podcasts de haute qualité que vous pourrez apprécier dès maintenant. C'est la meilleure application de podcast et fonctionne sur Android, iPhone et le Web. Inscrivez-vous pour synchroniser les abonnements sur tous les appareils.