Branching Strategies For Git and Subversion

40 %
60 %
Information about Branching Strategies For Git and Subversion
Technology

Published on October 23, 2014

Author: ielian

Source: slideshare.net

Description

most common source control branching strategies for Git and Subversion.

1. Branching Strategy For Git and Subversion

2. Subversion ● Subversion is a centralized source control management system. ● Very easy to use, checkout a working copy and sync before you check-in ● Multiple working copies to work on different releases. big context switch. ● Hard at merge. Prepare to rewrite the code while you are at it.

3. Branching in Subversion ● Use trunk for development ● Branch for releases and bugfixes ● Merge branch back into trunk after deployment ● Reintegrate branch and don’t use again ● Use maven release plugin to publish artifacts and tag source ● Let release branches track prod (not trunk)

4. trunk bugfixes release env 3.merge hotfix tag 2.0 1.prepare hotfix 2.deploy release 2.0 RC1 1.prepare release tag 1.1 3.merge release 2.deploy hotfix

5. Maven release plugin <!-- scm repo url --> <scm><connection>https://myrepo/myproject/trunk</connection></scm> <!-- release plugin --> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-release-plugin</artifactId> <version>2.4.1</version> <configuration> <tagBase>https://myrepo/myproject/tags</tagBase> <tagNameFormat>${project.version}</tagNameFormat> <dryRun>false</dryRun> <checkModificationExcludes> <checkModificationExclude>pom.xml</checkModificationExclude> </checkModificationExcludes> </configuration> </plugin>

6. Git ● Git is a distrubuted source control management system. ● Not easy to use: clone repo, checkout a branch to local copy, pull and push to origin ● One working copy enough to work on different releases. fast context switch. ● Excellent merge because of the local history

7. Branching in Git ● Use develop branch for development ● Use master as golden image. i.e. merge back to master after deployment ● Use bugfixes and release branches as “release” branches. i.e. deploy from these ● Don’t release from master or develop ● Use private branches outside of these freely ● Let master track prod

8. master develop bugfixes release env tag 1.0 3.merge hotfix tag 2.0 1.prepare hotfix next release 2.deploy release 2.0 RC1 1.prepare release tag 1.1 3.merge release 2.deploy hotfix

9. Fini

Add a comment

Related presentations

Presentación que realice en el Evento Nacional de Gobierno Abierto, realizado los ...

In this presentation we will describe our experience developing with a highly dyna...

Presentation to the LITA Forum 7th November 2014 Albuquerque, NM

Un recorrido por los cambios que nos generará el wearabletech en el futuro

Um paralelo entre as novidades & mercado em Wearable Computing e Tecnologias Assis...

Microsoft finally joins the smartwatch and fitness tracker game by introducing the...

Related pages

Git - Branching Workflows

Branching Workflows. ... possible workflows for your Git project in Distributed Git, so before you decide which branching scheme your next ...
Read more

version control - Branching Strategies - Stack Overflow

... what different kinds of branching strategies the ... proper branching... And GIT folks ... section on branching in the Subversion Book ...
Read more

Branching Strategies - Howto - sites.google.com

If you are familiar with SCM systems that supports branching and merging such as Git, Mercurial or ClearCase you will probably also recognize the term ...
Read more

Branching Strategies: When To Branch And Merge ...

Branching Strategies: When To Branch And Merge. ... Branching Strategies, Git, Source Control, Subversion.
Read more

svn - Best branching strategy when doing continuous ...

Best branching strategy when doing continuous integration? ... to use both of these strategies ... collab.net/subversion/2007/11/branching ...
Read more

Chapter 5 – Defining Your Branching and Merging Strategy

... Defining Your Branching and Merging Strategy. ... This chapter introduces branching and merging strategies for a range of common scenarios.
Read more

A successful Git branching model » nvie.com

A successful Git branching model. By ... Git really changed the way developers think of merging and branching. From the classic CVS/Subversion world I ...
Read more

Branching and Merging Primer - msdn.microsoft.com

... and the various branching and merging strategies. ... Examples of branching strategies. Branch Type Aligns with; A change request (or enhancement)
Read more

Version Control Guide (ex-Branching & Merging) - Home

Practical guidance for version control strategies on TFS, TFVC, Git and NuGet. Code Plex ... Branching strategies with TFVC; Map TFVC actions to Git;
Read more

Common Branching Patterns - Version Control with Subversion

This documentation was written to describe the 1.7.x series of Apache™ Subversion®. If you ... Common Branching Patterns; Prev ...
Read more