Every repository starts with a main branch.

A trick to replicate just a single changeset from main.

Our recommended option – single source of truth and not exact clones.

Sources of truth in distributed development.

Use pull to resolve concurrent changes on your repo.

Concurrent changesets on different repos.

Handling concurrent changes on replicated repos.

Why normal changeset numbers don’t always match, and do we need GUIDs?.

Is distributed better for branching and merging?.

Plastic can do centralized and distributed.

Centralized and distributed flavors and layouts.

Practical advice: Fantastic repos and when to create them.Keep it simple - Don’t overdesign your repo structure.Automation, orchestration and mergebots.How do task branches blend with distributed development?.Why do I insist on using task branches instead of just doing checkin?.Task branches blend well with Trunk-based development.Automated tests passing on each task branch.Have well-known starting points - do not shoot moving targets!.A small story on our experience with Exploratory.Validation – exploratory tests on each task.Reviews are crucial to prevent code from rotting.How we started reviewing every single task.A finished task must be ready to be deployed.What happens when a task can’t be merged automatically?.Task branches turn plans into solid artifacts that developers can touch.Objection: But… you need to be very careful with checkins, that’s a lot of work!.Checkin often and keep reviewers in mind.Techniques to keep branches independent.

What if you really need tasks to depend on each other.

You annotate a given revision of a file.

Annotate/blame from command line and GUI.

Are task branches mandatory in Plastic SCM?.

Winmerge filter exclude directory