![]() What if you really want to override changes?.Switch branch with changes – why it is risky.Tuning the update operation in full workspaces.Locking: avoiding merges for unmergeable files.Conflicts during checkin – working on a single branch.Re-merging a branch that was subtracted.Automatic resolution of directory conflicts.Conflict resolution order – directories before files.Recursive merge – why it is better than just choosing one ancestor.Recursive merge – more than 2 ancestors.2-way merge: life before common ancestors.Plastic always creates a changeset as result of the merge.Merge contributors: source, destination and base.Changesets can be moved to a different branch.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?.After the job was completed we were thrilled with how it turned out! We stayed off of it until Caleb sai. When the big day of concrete pouring came, a much larger crew showed up along with five cement trucks (they were hard to keep track of because one would unload and another was showing up). We were kept "in the loop" the whole time. ![]() Caleb and the crew either arrived on time or even early on several occasions. He was kind and professional and explained everything that we needed to know. We met with Caleb, the owner, and went over the job. Our job was to be done in concrete and we were told exactly when it would be framed, how long it would take, and when the concrete would then be poured. Along with this, they put in several sidewalk areas and rebuilt the culverts. They also laid the foundation for a small one car garage. They put in a long, winding driveway that included a width for one car and then for two cars. Flag as inappropriate Cornerstone Construction did a large job on our property.
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |