85.33 Git Workflow

20190415 For the typical developer workflow within a project see Section 85.4.

A fetch updates the local copy of the repository to match the remote repository. It will not modify your working copy of the files at all.

$ git fetch

A pull will first do a fetch and then a merge.

A diff will show changes made to the local main branch versus the repository main branch using difftool:

$ git difftool origin/main main

To match our local main branch with the remote main branch we rebase our repository:

$ git rebase

We can hand merge or use the mergetool to interactively resolve any conflicts between local changes and remote changes:

$ git mergetool

To list all local commits we can query the log

$ git log --oneline

To list the repository commits (after a fetch) we also query the log:

$ git log origin/main --oneline


Your donation will support ongoing availability and give you access to the PDF version of the 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.