Subversion

Presentation/Demo (Iona)

Mercurial

Presentation/Demo (Eran, Katja)

Fossil

Presentation/Demo (Iliana)

Git

Clones

For distributed SCM, entire repositories can be cloned, i.e., duplicated.

Remotes

• An SCM repository can have one or more remotes.

• Commits can be fetched from, or pushed to, the remotes.

Repository network topologies

SCM repository hosting

• Cloud based
• Forking workflow (fork = cloud-side clone)
• Pull/merge requests
• Examples: GitHub, Bitbucket, GitLab, etc.
• Access control
• Public vs. private repositories

Back to the real-world example

Cloud-based, hub-forking collaboration

• Bob sets up main upstream repo in the cloud
• Bob, Stuart, and Kevin each
  • fork this repo
  • clone their respective fork (their origin)
  • add a remote pointing to upstream
• Local commits are pushed to the respective origin remote
• Pull requests to upstream are opened using the cloud web app
• Conflicts are resolved locally

Demo Time!

Kevin’s conundrum

Scenario 1

Merge from upstream, push, pull request

Further Reading

• Understanding the GitHub Flow
• Git Workflows and Tutorials: Comparing Workflows
• Pro Git 3.4: Git Branching – Branching Workflows

Upcoming topics

• Build/release lifecycles
• Build tools