branch-merge

[article]

Automation of Branching, Merging, and Notifications in Parallel Development

Summary:

Developers are distracted from coding by the need to interact with version control systems. Automation of branching, merging, and notifications allows developers to focus on coding. However, integration between the VCS and issue-tracking system, and preferably a continuous integration tool, is necessary to accomplish this goal.

Developers are distracted from coding by the need to interact with version control systems. Automation of branching, merging, and notifications allows developers to focus on coding. However, integration between the VCS and issue-tracking system, and preferably a continuous integration tool, is necessary to accomplish this goal.

About the author

[article]

Got Configuration Management Best Practices?

Summary:
Why is it that we keep revisiting configuration management “best practices”? It is not that they are not well covered. It is because they keep changing and every time we look at the process of development from a different perspective, we learn something new. Ben Weatherall found that what we do under the guise of CM differs in how we identify the problems to be solved, how we address those problems, and even what tools are appropriate.

Why is it that we keep revisiting configuration management “best practices”? It is not that they are not well covered. It is because they keep changing and every time we look at the process of development from a different perspective, we learn something new. Ben Weatherall found that what we do under the guise of CM differs in how we identify the problems to be solved, how we address those problems, and even what tools are appropriate.

About the author

[article]

Release Management and Deployment Essentials

Summary:
Business requirements often dictate how changes in release management are addressed. But by following some essential practices and core beliefs, database deployment does not have to result in the headaches once caused.

Business requirements often dictate how changes in release management are addressed. But by following some essential practices and core beliefs, database deployment does not have to result in the headaches once caused.

About the author

[article]

Lean Development Principles for Branching and Merging

Summary:
By reworking lean principles for the branching and merging arena, we're able to create automated builds and unit tests to increase effectiveness and improve quality in software configuration management. Individual developers and teams alike can benefit from this process-improving strategy.

By reworking lean principles for the branching and merging arena, we're able to create automated builds and unit tests to increase effectiveness and improve quality in software configuration management. Individual developers and teams alike can benefit from this process-improving strategy.

About the author

About the author

About the author

[article]

Merging Defect Fixes into the Development Codeline

Summary:

No matter what type of software you develop, from internal IT applications to web applications to commercial software packages, fixing bugs following a release is part of the software development lifecycle. Realistically, software maintenance can be a project by itself. However, the process of merging production fixes into the development codeline is an equally significant effort. Unfortunately, the effort required to merge production fixes into the development codeline can be grossly underestimated and improperly staffed even by organizations that practice otherwise good software development.

No matter what type of software you develop, from internal IT applications to web applications to commercial software packages, fixing bugs following a release is part of the software development lifecycle. Realistically, software maintenance can be a project by itself. However, the process of merging production fixes into the development codeline is an equally significant effort. Unfortunately, the effort required to merge production fixes into the development codeline can be grossly underestimated and improperly staffed even by organizations that practice otherwise good software development.

About the author

[article]

Merge Branches

Summary:
What is "Merge Branches?" Many people find the word "merge" to be confusing, since it seems to imply that we start out with two things and end up with only one. I'm not going to start trying to invent new vocabulary. Instead, let's just try to be clear about what we mean we speak about merging branches.

What is "Merge Branches?" Many people find the word "merge" to be confusing, since it seems to imply that we start out with two things and end up with only one. I'm not going to start trying to invent new vocabulary. Instead, let's just try to be clear about what we mean we speak about merging branches.

About the author

[article]

Approaching Parallel Development with Branch - Merge Strategies

Summary:
Many times when managers first consider parallel development, it appears to be a very effective way to manage changes to concurrent streams of development. This is somewhat true if the project uses an SCM technology that allows for stable branching and establishes discreet project and maintenance branches. However, what is often forgotten is that while branching is a great way to separate code changes, at some point merging will have to occur. This article provides guidance for approaching and performing parallel development.

Many times when managers first consider parallel development, it appears to be a very effective way to manage changes to concurrent streams of development. This is somewhat true if the project uses an SCM technology that allows for stable branching and establishes discreet project and maintenance branches. However, what is often forgotten is that while branching is a great way to separate code changes, at some point merging will have to occur. This article provides guidance for approaching and performing parallel development.

About the author

[article]

An Agile Perspective on Branching and Merging

Summary:
This article focuses on branching and merging. We present some background for branching and merging, and consider some of the implications for agile development in particular. We also hope to reduce some of the suspicion that many agile developers have of branching. The article assumes some overall branching knowledge and yet revisits some particular details that often seem to confuse people. This is a fertile area which we will continue to expand on in future articles.

This article focuses on branching and merging. We present some background for branching and merging, and consider some of the implications for agile development in particular. We also hope to reduce some of the suspicion that many agile developers have of branching. The article assumes some overall branching knowledge and yet revisits some particular details that often seem to confuse people. This is a fertile area which we will continue to expand on in future articles.

About the author

About the author

About the author

AgileConnection is a TechWell community.

Through conferences, training, consulting, and online resources, TechWell helps you develop and deliver great software every day.