84.31 Git Update Master from Dev
When we are ready to merge the work we have completed in the dev branch back into the main then we will typically do the following:
$ git checkout main $ git merge dev $ git mergetool
The mergetool command allows us to resolve any conflicts.
Your donation will support ongoing development and give you access to the PDF version of this book. Desktop Survival Guides include Data Science, GNU/Linux, and MLHub. Books available on Amazon include Data Mining with Rattle and Essentials of Data Science. Popular open source software includes rattle, wajig, and mlhub. Hosted by Togaware, a pioneer of free and open source software since 1984. Copyright © 1995-2021 Graham.Williams@togaware.com Creative Commons Attribution-ShareAlike 4.0.