SlideShare uma empresa Scribd logo

Perforce convergence vs divergence

•Transferir como PPS, PDF•
•
Eric Patey
Eric Patey
Educação
1 de 24
Convergence vs. Divergence Purposeful Merging with Perforce Laura Wingerd  Perforce Software  www.perforce.com
Overview ,[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],[object Object]
Branching... DevX Main Rel 2 Rel 1 DevY DevZ
Branches over time... ,[object Object],Main Rel1 Main Rel1 Main DevX Rel1 Main DevX DevY Rel1 Main DevX DevY DevZ Rel1 Main Rel2 DevX DevY DevZ Rel1 Main Rel2 DevX DevZ Rel1 Main Rel2 DevX DevZ Rel1 Main Rel2 DevX DevZ Rel1 Main Rel2 DevX DevZ Rel1 Main Rel2 DevX DevZ
Branches diverge when… ,[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],[object Object]
Branches converge when... ,[object Object],[object Object],[object Object],[object Object],[object Object],[object Object]
Merging files ,[object Object],[object Object]
Integration history “arrows” ,[object Object],[object Object],[object Object],[object Object]
Three-way file merging ,[object Object],[object Object],[object Object],[object Object],MERGED TARGET SOURCE BASE
The essence of a three-way merge A4 B5 C3 D2 E6 A4 B5 C4 D4 E7 A4 B6 C3 D3 E7 A4 B6 C4 ? E7 MERGED BASE SOURCE TARGET
Three-way file merge tools vary... ,[object Object],[object Object],[object Object],[object Object]
Perforce’s merge tools ,[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],<figure id=&quot;create_gizmo&quot;> <title> The 'Create Gizmo' dialog </title> <graphic fileref=&quot;img/cg.gif&quot;/> </figure>
What makes a good merge base? SOURCE ,[object Object],[object Object],? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? X Y ? ? TARGET Z
The effect of base selection SOURCE TARGET A1 B1 C1 A1 ? ? X Y Z A1 B2 C1 A1 B2 C2 A1 B2 C1 A1 B3 C1 A1 B3 C2 A1 B3 C4 A1 B4 C4 A1 B3 C3 A2 B3 C4 A2 B3 C1 A1 ? ? A1 ? ? A3 B4 C4 A1 B4 C3 A3 B3 C4 A3 B4 ? A3 B3 C3 A3 B4 C3 A1 B4 C3 A3 B3 C4 A1 B3 C3 A3 B4 C4 ? B4 C3 ? B4 ? A3 B4 ? A3 ? ?
Base selection through the ages X Y Z SOURCE TARGET
Arrow types and base selection X Y Z SOURCE TARGET A1 B1 C1 A1 B2 C1 A1 B2 C2 A1 B2 C1 A1 B3 C1 A1 B5 C2 A1 B4 C1 A1 B6 C2 A1 B3 C2 A1 B4 C2 A1 B6 C2 A2 B4 C1 A2 ? C2 A1 B3 C1
Preserving divergence ,[object Object],[object Object],[object Object],A B C D E F
“ Inherited” divergence A B C
Unintentional divergence ,[object Object],A B “ nothing to integrate” C D ,[object Object]
The effect of “edit” arrows C D A B ,[object Object]
Guaranteeing convergence ,[object Object],COPY
Assuring a correct copy ,[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],[object Object]
In a nutshell: ,[object Object],[object Object],[object Object],[object Object]
Convergence vs. Divergence Purposeful Merging with Perforce Laura Wingerd  Perforce Software  www.perforce.com

Recomendados

Spring Boot to Quarkus: A real app migration experience | DevNation Tech Talk
Spring Boot to Quarkus: A real app migration experience | DevNation Tech TalkSpring Boot to Quarkus: A real app migration experience | DevNation Tech Talk
Spring Boot to Quarkus: A real app migration experience | DevNation Tech Talk
Red Hat Developers
 
Best Practices of Infrastructure as Code with Terraform
Best Practices of Infrastructure as Code with TerraformBest Practices of Infrastructure as Code with Terraform
Best Practices of Infrastructure as Code with Terraform
DevOps.com
 
Terraform
TerraformTerraform
Terraform
Phil Wilkins
 
Terraform
TerraformTerraform
Terraform
Diego Pacheco
 
Terraform modules and best-practices - September 2018
Terraform modules and best-practices - September 2018Terraform modules and best-practices - September 2018
Terraform modules and best-practices - September 2018
Anton Babenko
 
Terraform
TerraformTerraform
Terraform
Marcelo Serpa
 
Final terraform
Final terraformFinal terraform
Final terraform
Gourav Varma
 
Spring Integration 超入門
Spring Integration 超入門Spring Integration 超入門
Spring Integration 超入門
Yasutaka Sugamura
 

Recomendados

Spring Boot to Quarkus: A real app migration experience | DevNation Tech Talk
Spring Boot to Quarkus: A real app migration experience | DevNation Tech TalkSpring Boot to Quarkus: A real app migration experience | DevNation Tech Talk
Spring Boot to Quarkus: A real app migration experience | DevNation Tech Talk
Red Hat Developers
 
Best Practices of Infrastructure as Code with Terraform
Best Practices of Infrastructure as Code with TerraformBest Practices of Infrastructure as Code with Terraform
Best Practices of Infrastructure as Code with Terraform
DevOps.com
 
Terraform
TerraformTerraform
Terraform
Phil Wilkins
 
Terraform
TerraformTerraform
Terraform
Diego Pacheco
 
Terraform modules and best-practices - September 2018
Terraform modules and best-practices - September 2018Terraform modules and best-practices - September 2018
Terraform modules and best-practices - September 2018
Anton Babenko
 
Terraform
TerraformTerraform
Terraform
Marcelo Serpa
 
Final terraform
Final terraformFinal terraform
Final terraform
Gourav Varma
 
Spring Integration 超入門
Spring Integration 超入門Spring Integration 超入門
Spring Integration 超入門
Yasutaka Sugamura
 
Terraform
TerraformTerraform
Terraform
Pathum Fernando ☁
 
再考、3つの仮想デスクトップイメージ管理と比較
再考、3つの仮想デスクトップイメージ管理と比較再考、3つの仮想デスクトップイメージ管理と比較
再考、3つの仮想デスクトップイメージ管理と比較
Citrix Systems Japan
 
Terraform Modules and Continuous Deployment
Terraform Modules and Continuous DeploymentTerraform Modules and Continuous Deployment
Terraform Modules and Continuous Deployment
Zane Williamson
 
Building infrastructure as code using Terraform - DevOps Krakow
Building infrastructure as code using Terraform - DevOps KrakowBuilding infrastructure as code using Terraform - DevOps Krakow
Building infrastructure as code using Terraform - DevOps Krakow
Anton Babenko
 
Terraform: An Overview & Introduction
Terraform: An Overview & IntroductionTerraform: An Overview & Introduction
Terraform: An Overview & Introduction
Lee Trout
 
Evolution of containers to kubernetes
Evolution of containers to kubernetesEvolution of containers to kubernetes
Evolution of containers to kubernetes
Krishna-Kumar
 
Terraform
TerraformTerraform
Terraform
Adam Vincze
 
Using HashiCorp’s Terraform to build your infrastructure on AWS - Pop-up Loft...
Using HashiCorp’s Terraform to build your infrastructure on AWS - Pop-up Loft...Using HashiCorp’s Terraform to build your infrastructure on AWS - Pop-up Loft...
Using HashiCorp’s Terraform to build your infrastructure on AWS - Pop-up Loft...
Amazon Web Services
 
Terraform introduction
Terraform introductionTerraform introduction
Terraform introduction
Jason Vance
 
Terraform day1
Terraform day1Terraform day1
Terraform day1
Gourav Varma
 
Effective terraform
Effective terraformEffective terraform
Effective terraform
Calvin French-Owen
 
Hashicorp-Certified-Terraform-Associate-v3-edited.pptx
Hashicorp-Certified-Terraform-Associate-v3-edited.pptxHashicorp-Certified-Terraform-Associate-v3-edited.pptx
Hashicorp-Certified-Terraform-Associate-v3-edited.pptx
ssuser0d6c88
 
Creating AWS infrastructure using Terraform
Creating AWS infrastructure using TerraformCreating AWS infrastructure using Terraform
Creating AWS infrastructure using Terraform
Knoldus Inc.
 
Repository Management with JFrog Artifactory
Repository Management with JFrog ArtifactoryRepository Management with JFrog Artifactory
Repository Management with JFrog Artifactory
Stephen Chin
 
Infrastructure as Code
Infrastructure as CodeInfrastructure as Code
Infrastructure as Code
Albert Suwandhi
 
はじめてのAzure Web App for Containers! -コンテナの基礎から DevOps 環境の構築まで-
はじめてのAzure Web App for Containers! -コンテナの基礎から DevOps 環境の構築まで-はじめてのAzure Web App for Containers! -コンテナの基礎から DevOps 環境の構築まで-
はじめてのAzure Web App for Containers! -コンテナの基礎から DevOps 環境の構築まで-
Saki Homma
 
Terraform modules restructured
Terraform modules restructuredTerraform modules restructured
Terraform modules restructured
Ami Mahloof
 
Comparing Next-Generation Container Image Building Tools
Comparing Next-Generation Container Image Building Tools Comparing Next-Generation Container Image Building Tools
Comparing Next-Generation Container Image Building Tools
Akihiro Suda
 
Infrastructure as Code with Terraform and Ansible
Infrastructure as Code with Terraform and AnsibleInfrastructure as Code with Terraform and Ansible
Infrastructure as Code with Terraform and Ansible
DevOps Meetup Bern
 
Crossplane @ Mastering GitOps.pdf
Crossplane @ Mastering GitOps.pdfCrossplane @ Mastering GitOps.pdf
Crossplane @ Mastering GitOps.pdf
QAware GmbH
 
Diverge to Converge: The Integrated Future of PR
Diverge to Converge: The Integrated Future of PRDiverge to Converge: The Integrated Future of PR
Diverge to Converge: The Integrated Future of PR
Chris Kemper
 
Foursight Presentation on Leadership Development Program Offerings
Foursight Presentation on Leadership Development Program OfferingsFoursight Presentation on Leadership Development Program Offerings
Foursight Presentation on Leadership Development Program Offerings
Judith Laws
 

Mais conteúdo relacionado

Mais procurados

Terraform introduction
Terraform introductionTerraform introduction
Terraform introduction
Jason Vance
 
Comparing Next-Generation Container Image Building Tools
Comparing Next-Generation Container Image Building Tools Comparing Next-Generation Container Image Building Tools
Comparing Next-Generation Container Image Building Tools
Akihiro Suda
 
Crossplane @ Mastering GitOps.pdf
Crossplane @ Mastering GitOps.pdfCrossplane @ Mastering GitOps.pdf
Crossplane @ Mastering GitOps.pdf
QAware GmbH
 

Mais procurados (20)

Terraform
TerraformTerraform
Terraform
 
再考、3つの仮想デスクトップイメージ管理と比較
再考、3つの仮想デスクトップイメージ管理と比較再考、3つの仮想デスクトップイメージ管理と比較
再考、3つの仮想デスクトップイメージ管理と比較
 
Terraform Modules and Continuous Deployment
Terraform Modules and Continuous DeploymentTerraform Modules and Continuous Deployment
Terraform Modules and Continuous Deployment
 
Building infrastructure as code using Terraform - DevOps Krakow
Building infrastructure as code using Terraform - DevOps KrakowBuilding infrastructure as code using Terraform - DevOps Krakow
Building infrastructure as code using Terraform - DevOps Krakow
 
Terraform: An Overview & Introduction
Terraform: An Overview & IntroductionTerraform: An Overview & Introduction
Terraform: An Overview & Introduction
 
Evolution of containers to kubernetes
Evolution of containers to kubernetesEvolution of containers to kubernetes
Evolution of containers to kubernetes
 
Terraform
TerraformTerraform
Terraform
 
Using HashiCorp’s Terraform to build your infrastructure on AWS - Pop-up Loft...
Using HashiCorp’s Terraform to build your infrastructure on AWS - Pop-up Loft...Using HashiCorp’s Terraform to build your infrastructure on AWS - Pop-up Loft...
Using HashiCorp’s Terraform to build your infrastructure on AWS - Pop-up Loft...
 
Terraform introduction
Terraform introductionTerraform introduction
Terraform introduction
 
Terraform day1
Terraform day1Terraform day1
Terraform day1
 
Effective terraform
Effective terraformEffective terraform
Effective terraform
 
Hashicorp-Certified-Terraform-Associate-v3-edited.pptx
Hashicorp-Certified-Terraform-Associate-v3-edited.pptxHashicorp-Certified-Terraform-Associate-v3-edited.pptx
Hashicorp-Certified-Terraform-Associate-v3-edited.pptx
 
Creating AWS infrastructure using Terraform
Creating AWS infrastructure using TerraformCreating AWS infrastructure using Terraform
Creating AWS infrastructure using Terraform
 
Repository Management with JFrog Artifactory
Repository Management with JFrog ArtifactoryRepository Management with JFrog Artifactory
Repository Management with JFrog Artifactory
 
Infrastructure as Code
Infrastructure as CodeInfrastructure as Code
Infrastructure as Code
 
はじめてのAzure Web App for Containers! -コンテナの基礎から DevOps 環境の構築まで-
はじめてのAzure Web App for Containers! -コンテナの基礎から DevOps 環境の構築まで-はじめてのAzure Web App for Containers! -コンテナの基礎から DevOps 環境の構築まで-
はじめてのAzure Web App for Containers! -コンテナの基礎から DevOps 環境の構築まで-
 
Terraform modules restructured
Terraform modules restructuredTerraform modules restructured
Terraform modules restructured
 
Comparing Next-Generation Container Image Building Tools
Comparing Next-Generation Container Image Building Tools Comparing Next-Generation Container Image Building Tools
Comparing Next-Generation Container Image Building Tools
 
Infrastructure as Code with Terraform and Ansible
Infrastructure as Code with Terraform and AnsibleInfrastructure as Code with Terraform and Ansible
Infrastructure as Code with Terraform and Ansible
 
Crossplane @ Mastering GitOps.pdf
Crossplane @ Mastering GitOps.pdfCrossplane @ Mastering GitOps.pdf
Crossplane @ Mastering GitOps.pdf
 

Destaque

Diverge to Converge: The Integrated Future of PR
Diverge to Converge: The Integrated Future of PRDiverge to Converge: The Integrated Future of PR
Diverge to Converge: The Integrated Future of PR
Chris Kemper
 
Foursight Presentation on Leadership Development Program Offerings
Foursight Presentation on Leadership Development Program OfferingsFoursight Presentation on Leadership Development Program Offerings
Foursight Presentation on Leadership Development Program Offerings
Judith Laws
 
Surrounded By Genius: Practical Advice On Creative Leadership
Surrounded By Genius: Practical Advice On Creative LeadershipSurrounded By Genius: Practical Advice On Creative Leadership
Surrounded By Genius: Practical Advice On Creative Leadership
Kelsey Ruger
 
Strategic innovation leadership df - perth
Strategic innovation leadership df - perthStrategic innovation leadership df - perth
Strategic innovation leadership df - perth
buddhabaredu
 
Foursight- Business Plan (1) (1)
Foursight- Business Plan (1) (1)Foursight- Business Plan (1) (1)
Foursight- Business Plan (1) (1)
Christopher Estrada
 
Sta convention 2012
Sta convention 2012Sta convention 2012
Sta convention 2012
Chris Hunter
 
Hotel foursight (with address)
Hotel foursight (with address)Hotel foursight (with address)
Hotel foursight (with address)
Sanjeev Wadera
 
The Creative Method v2
The Creative Method v2The Creative Method v2
The Creative Method v2
Jason Theodor
 
Foursight Company Profile (2)
Foursight Company Profile (2)Foursight Company Profile (2)
Foursight Company Profile (2)
Thauseef Ahmed
 
Divergent and Convergent Thinking
Divergent and Convergent ThinkingDivergent and Convergent Thinking
Divergent and Convergent Thinking
llfsudha
 

Destaque (20)

Diverge to Converge: The Integrated Future of PR
Diverge to Converge: The Integrated Future of PRDiverge to Converge: The Integrated Future of PR
Diverge to Converge: The Integrated Future of PR
 
Foursight Presentation on Leadership Development Program Offerings
Foursight Presentation on Leadership Development Program OfferingsFoursight Presentation on Leadership Development Program Offerings
Foursight Presentation on Leadership Development Program Offerings
 
Surrounded By Genius: Practical Advice On Creative Leadership
Surrounded By Genius: Practical Advice On Creative LeadershipSurrounded By Genius: Practical Advice On Creative Leadership
Surrounded By Genius: Practical Advice On Creative Leadership
 
Lesson 1 four sighttraining
Lesson 1 four sighttrainingLesson 1 four sighttraining
Lesson 1 four sighttraining
 
Strategic innovation leadership df - perth
Strategic innovation leadership df - perthStrategic innovation leadership df - perth
Strategic innovation leadership df - perth
 
Foursight- Business Plan (1) (1)
Foursight- Business Plan (1) (1)Foursight- Business Plan (1) (1)
Foursight- Business Plan (1) (1)
 
FourSight Collective
FourSight Collective FourSight Collective
FourSight Collective
 
FourSight Quotes
FourSight QuotesFourSight Quotes
FourSight Quotes
 
Sta convention 2012
Sta convention 2012Sta convention 2012
Sta convention 2012
 
Hotel foursight (with address)
Hotel foursight (with address)Hotel foursight (with address)
Hotel foursight (with address)
 
The Creative Method v2
The Creative Method v2The Creative Method v2
The Creative Method v2
 
Foursight Company Profile (2)
Foursight Company Profile (2)Foursight Company Profile (2)
Foursight Company Profile (2)
 
Team Building Information for Leadership Development at The Banff Centre
Team Building Information for Leadership Development at The Banff CentreTeam Building Information for Leadership Development at The Banff Centre
Team Building Information for Leadership Development at The Banff Centre
 
2013summerschoolday9 ideation
2013summerschoolday9 ideation2013summerschoolday9 ideation
2013summerschoolday9 ideation
 
Amway four sight_debrief_ed
Amway four sight_debrief_edAmway four sight_debrief_ed
Amway four sight_debrief_ed
 
Divergent and Convergent Thinking
Divergent and Convergent ThinkingDivergent and Convergent Thinking
Divergent and Convergent Thinking
 
Operations
Operations Operations
Operations
 
Creative Leadership
Creative LeadershipCreative Leadership
Creative Leadership
 
Convergent & Divergent Thinking
Convergent & Divergent ThinkingConvergent & Divergent Thinking
Convergent & Divergent Thinking
 
Creative thinking
Creative thinkingCreative thinking
Creative thinking
 

Semelhante a Perforce convergence vs divergence

mediaandinformationliteracymil-textinformationandmediapart1-170907011110-conv...
mediaandinformationliteracymil-textinformationandmediapart1-170907011110-conv...mediaandinformationliteracymil-textinformationandmediapart1-170907011110-conv...
mediaandinformationliteracymil-textinformationandmediapart1-170907011110-conv...
Lyka Gumatay
 
Data structures graphics library in computer graphics.
Data structures graphics library in computer graphics.Data structures graphics library in computer graphics.
Data structures graphics library in computer graphics.
Daroko blog(www.professionalbloggertricks.com)
 
Machine Learning with Apache Mahout
Machine Learning with Apache MahoutMachine Learning with Apache Mahout
Machine Learning with Apache Mahout
Daniel Glauser
 
Fishing Graphs in a Hadoop Data Lake
Fishing Graphs in a Hadoop Data Lake Fishing Graphs in a Hadoop Data Lake
Fishing Graphs in a Hadoop Data Lake
DataWorks Summit/Hadoop Summit
 
Project Deliverable 3 Database and Programming DesignThis ass.docx
Project Deliverable 3 Database and Programming DesignThis ass.docxProject Deliverable 3 Database and Programming DesignThis ass.docx
Project Deliverable 3 Database and Programming DesignThis ass.docx
bfingarjcmc
 
Hive Bucketing in Apache Spark
Hive Bucketing in Apache SparkHive Bucketing in Apache Spark
Hive Bucketing in Apache Spark
Tejas Patil
 
Code as Data workshop: Using source{d} Engine to extract insights from git re...
Code as Data workshop: Using source{d} Engine to extract insights from git re...Code as Data workshop: Using source{d} Engine to extract insights from git re...
Code as Data workshop: Using source{d} Engine to extract insights from git re...
source{d}
 

Semelhante a Perforce convergence vs divergence (20)

03 introduction to graph databases
03 introduction to graph databases03 introduction to graph databases
03 introduction to graph databases
 
Perl DBI Scripting with the ILS
Perl DBI Scripting with the ILSPerl DBI Scripting with the ILS
Perl DBI Scripting with the ILS
 
Programming Design Guidelines
Programming Design GuidelinesProgramming Design Guidelines
Programming Design Guidelines
 
mediaandinformationliteracymil-textinformationandmediapart1-170907011110-conv...
mediaandinformationliteracymil-textinformationandmediapart1-170907011110-conv...mediaandinformationliteracymil-textinformationandmediapart1-170907011110-conv...
mediaandinformationliteracymil-textinformationandmediapart1-170907011110-conv...
 
Data structures graphics library in computer graphics.
Data structures graphics library in computer graphics.Data structures graphics library in computer graphics.
Data structures graphics library in computer graphics.
 
Machine Learning with Apache Mahout
Machine Learning with Apache MahoutMachine Learning with Apache Mahout
Machine Learning with Apache Mahout
 
Fishing Graphs in a Hadoop Data Lake
Fishing Graphs in a Hadoop Data Lake Fishing Graphs in a Hadoop Data Lake
Fishing Graphs in a Hadoop Data Lake
 
Hpverticacertificationguide 150322232921-conversion-gate01
Hpverticacertificationguide 150322232921-conversion-gate01Hpverticacertificationguide 150322232921-conversion-gate01
Hpverticacertificationguide 150322232921-conversion-gate01
 
Hp vertica certification guide
Hp vertica certification guideHp vertica certification guide
Hp vertica certification guide
 
Fishing Graphs in a Hadoop Data Lake
Fishing Graphs in a Hadoop Data LakeFishing Graphs in a Hadoop Data Lake
Fishing Graphs in a Hadoop Data Lake
 
Project Deliverable 3 Database and Programming DesignThis ass.docx
Project Deliverable 3 Database and Programming DesignThis ass.docxProject Deliverable 3 Database and Programming DesignThis ass.docx
Project Deliverable 3 Database and Programming DesignThis ass.docx
 
Fishing Graphs in a Hadoop Data Lake by Jörg Schad and Max Neunhoeffer at Big...
Fishing Graphs in a Hadoop Data Lake by Jörg Schad and Max Neunhoeffer at Big...Fishing Graphs in a Hadoop Data Lake by Jörg Schad and Max Neunhoeffer at Big...
Fishing Graphs in a Hadoop Data Lake by Jörg Schad and Max Neunhoeffer at Big...
 
Introduction to Graph Databases
Introduction to Graph DatabasesIntroduction to Graph Databases
Introduction to Graph Databases
 
Hive Bucketing in Apache Spark
Hive Bucketing in Apache SparkHive Bucketing in Apache Spark
Hive Bucketing in Apache Spark
 
Non Relational Databases
Non Relational DatabasesNon Relational Databases
Non Relational Databases
 
資料視覺化 - D3 的第一堂課 | WeiYuan
資料視覺化 - D3 的第一堂課 | WeiYuan資料視覺化 - D3 的第一堂課 | WeiYuan
資料視覺化 - D3 的第一堂課 | WeiYuan
 
text media and information language.pptx
text media and information language.pptxtext media and information language.pptx
text media and information language.pptx
 
Go and Object Oriented Programming
Go and Object Oriented ProgrammingGo and Object Oriented Programming
Go and Object Oriented Programming
 
Code as Data workshop: Using source{d} Engine to extract insights from git re...
Code as Data workshop: Using source{d} Engine to extract insights from git re...Code as Data workshop: Using source{d} Engine to extract insights from git re...
Code as Data workshop: Using source{d} Engine to extract insights from git re...
 
Part I_Translating & Starting a Program_Compiler, Linker, Assembler, Loader_L...
Part I_Translating & Starting a Program_Compiler, Linker, Assembler, Loader_L...Part I_Translating & Starting a Program_Compiler, Linker, Assembler, Loader_L...
Part I_Translating & Starting a Program_Compiler, Linker, Assembler, Loader_L...
 

Último

會考英聽會考英聽會考英聽會考英聽會考英聽會考英聽會考英聽會考英聽會考英聽會考英聽
會考英聽會考英聽會考英聽會考英聽會考英聽會考英聽會考英聽會考英聽會考英聽會考英聽會考英聽會考英聽會考英聽會考英聽會考英聽會考英聽會考英聽會考英聽會考英聽會考英聽
會考英聽會考英聽會考英聽會考英聽會考英聽會考英聽會考英聽會考英聽會考英聽會考英聽
中 央社
 
IATP How-to Foreign Travel May 2024.pdff
IATP How-to Foreign Travel May 2024.pdffIATP How-to Foreign Travel May 2024.pdff
IATP How-to Foreign Travel May 2024.pdff
17thcssbs2
 
Navigating the Misinformation Minefield: The Role of Higher Education in the ...
Navigating the Misinformation Minefield: The Role of Higher Education in the ...Navigating the Misinformation Minefield: The Role of Higher Education in the ...
Navigating the Misinformation Minefield: The Role of Higher Education in the ...
Mark Carrigan
 
Basic Civil Engineering notes on Transportation Engineering, Modes of Transpo...
Basic Civil Engineering notes on Transportation Engineering, Modes of Transpo...Basic Civil Engineering notes on Transportation Engineering, Modes of Transpo...
Basic Civil Engineering notes on Transportation Engineering, Modes of Transpo...
Denish Jangid
 

Último (20)

會考英聽會考英聽會考英聽會考英聽會考英聽會考英聽會考英聽會考英聽會考英聽會考英聽
會考英聽會考英聽會考英聽會考英聽會考英聽會考英聽會考英聽會考英聽會考英聽會考英聽會考英聽會考英聽會考英聽會考英聽會考英聽會考英聽會考英聽會考英聽會考英聽會考英聽
會考英聽會考英聽會考英聽會考英聽會考英聽會考英聽會考英聽會考英聽會考英聽會考英聽
 
INU_CAPSTONEDESIGN_비밀번호486_업로드용 발표자료.pdf
INU_CAPSTONEDESIGN_비밀번호486_업로드용 발표자료.pdfINU_CAPSTONEDESIGN_비밀번호486_업로드용 발표자료.pdf
INU_CAPSTONEDESIGN_비밀번호486_업로드용 발표자료.pdf
 
IATP How-to Foreign Travel May 2024.pdff
IATP How-to Foreign Travel May 2024.pdffIATP How-to Foreign Travel May 2024.pdff
IATP How-to Foreign Travel May 2024.pdff
 
Application of Matrices in real life. Presentation on application of matrices
Application of Matrices in real life. Presentation on application of matricesApplication of Matrices in real life. Presentation on application of matrices
Application of Matrices in real life. Presentation on application of matrices
 
Operations Management - Book1.p - Dr. Abdulfatah A. Salem
Operations Management - Book1.p - Dr. Abdulfatah A. SalemOperations Management - Book1.p - Dr. Abdulfatah A. Salem
Operations Management - Book1.p - Dr. Abdulfatah A. Salem
 
An Overview of the Odoo 17 Discuss App.pptx
An Overview of the Odoo 17 Discuss App.pptxAn Overview of the Odoo 17 Discuss App.pptx
An Overview of the Odoo 17 Discuss App.pptx
 
Behavioral-sciences-dr-mowadat rana (1).pdf
Behavioral-sciences-dr-mowadat rana (1).pdfBehavioral-sciences-dr-mowadat rana (1).pdf
Behavioral-sciences-dr-mowadat rana (1).pdf
 
Word Stress rules esl .pptx
Word Stress rules esl .pptxWord Stress rules esl .pptx
Word Stress rules esl .pptx
 
REPRODUCTIVE TOXICITY STUDIE OF MALE AND FEMALEpptx
REPRODUCTIVE TOXICITY STUDIE OF MALE AND FEMALEpptxREPRODUCTIVE TOXICITY STUDIE OF MALE AND FEMALEpptx
REPRODUCTIVE TOXICITY STUDIE OF MALE AND FEMALEpptx
 
How to the fix Attribute Error in odoo 17
How to the fix Attribute Error in odoo 17How to the fix Attribute Error in odoo 17
How to the fix Attribute Error in odoo 17
 
Post Exam Fun(da) Intra UEM General Quiz 2024 - Prelims q&a.pdf
Post Exam Fun(da) Intra UEM General Quiz 2024 - Prelims q&a.pdfPost Exam Fun(da) Intra UEM General Quiz 2024 - Prelims q&a.pdf
Post Exam Fun(da) Intra UEM General Quiz 2024 - Prelims q&a.pdf
 
Navigating the Misinformation Minefield: The Role of Higher Education in the ...
Navigating the Misinformation Minefield: The Role of Higher Education in the ...Navigating the Misinformation Minefield: The Role of Higher Education in the ...
Navigating the Misinformation Minefield: The Role of Higher Education in the ...
 
Incoming and Outgoing Shipments in 2 STEPS Using Odoo 17
Incoming and Outgoing Shipments in 2 STEPS Using Odoo 17Incoming and Outgoing Shipments in 2 STEPS Using Odoo 17
Incoming and Outgoing Shipments in 2 STEPS Using Odoo 17
 
Capitol Tech Univ Doctoral Presentation -May 2024
Capitol Tech Univ Doctoral Presentation -May 2024Capitol Tech Univ Doctoral Presentation -May 2024
Capitol Tech Univ Doctoral Presentation -May 2024
 
Essential Safety precautions during monsoon season
Essential Safety precautions during monsoon seasonEssential Safety precautions during monsoon season
Essential Safety precautions during monsoon season
 
Basic Civil Engineering notes on Transportation Engineering, Modes of Transpo...
Basic Civil Engineering notes on Transportation Engineering, Modes of Transpo...Basic Civil Engineering notes on Transportation Engineering, Modes of Transpo...
Basic Civil Engineering notes on Transportation Engineering, Modes of Transpo...
 
“O BEIJO” EM ARTE .
“O BEIJO” EM ARTE .“O BEIJO” EM ARTE .
“O BEIJO” EM ARTE .
 
Stl Algorithms in C++ jjjjjjjjjjjjjjjjjj
Stl Algorithms in C++ jjjjjjjjjjjjjjjjjjStl Algorithms in C++ jjjjjjjjjjjjjjjjjj
Stl Algorithms in C++ jjjjjjjjjjjjjjjjjj
 
Features of Video Calls in the Discuss Module in Odoo 17
Features of Video Calls in the Discuss Module in Odoo 17Features of Video Calls in the Discuss Module in Odoo 17
Features of Video Calls in the Discuss Module in Odoo 17
 
slides CapTechTalks Webinar May 2024 Alexander Perry.pptx
slides CapTechTalks Webinar May 2024 Alexander Perry.pptxslides CapTechTalks Webinar May 2024 Alexander Perry.pptx
slides CapTechTalks Webinar May 2024 Alexander Perry.pptx
 

Perforce convergence vs divergence

  • 1. Convergence vs. Divergence Purposeful Merging with Perforce Laura Wingerd  Perforce Software  www.perforce.com
  • 2.
  • 3. Branching... DevX Main Rel 2 Rel 1 DevY DevZ
  • 4.
  • 5.
  • 6.
  • 7.
  • 8.
  • 9.
  • 10. The essence of a three-way merge A4 B5 C3 D2 E6 A4 B5 C4 D4 E7 A4 B6 C3 D3 E7 A4 B6 C4 ? E7 MERGED BASE SOURCE TARGET
  • 11.
  • 12.
  • 13.
  • 14. The effect of base selection SOURCE TARGET A1 B1 C1 A1 ? ? X Y Z A1 B2 C1 A1 B2 C2 A1 B2 C1 A1 B3 C1 A1 B3 C2 A1 B3 C4 A1 B4 C4 A1 B3 C3 A2 B3 C4 A2 B3 C1 A1 ? ? A1 ? ? A3 B4 C4 A1 B4 C3 A3 B3 C4 A3 B4 ? A3 B3 C3 A3 B4 C3 A1 B4 C3 A3 B3 C4 A1 B3 C3 A3 B4 C4 ? B4 C3 ? B4 ? A3 B4 ? A3 ? ?
  • 15. Base selection through the ages X Y Z SOURCE TARGET
  • 16. Arrow types and base selection X Y Z SOURCE TARGET A1 B1 C1 A1 B2 C1 A1 B2 C2 A1 B2 C1 A1 B3 C1 A1 B5 C2 A1 B4 C1 A1 B6 C2 A1 B3 C2 A1 B4 C2 A1 B6 C2 A2 B4 C1 A2 ? C2 A1 B3 C1
  • 17.
  • 19.
  • 20.
  • 21.
  • 22.
  • 23.
  • 24. Convergence vs. Divergence Purposeful Merging with Perforce Laura Wingerd  Perforce Software  www.perforce.com

Notas do Editor

  1. x