Multiple projects, different goals, same codebase!

Carlos Lopes

Talk: 60 minutes

Summary

Are you developing new functionalities into branches? Have you ever experienced the pain of merging the changes into trunk? The so called “merge hell” is one of the first and probably the most important smell that tells you’ve been abusing of your source control manager branching capabilities and, most likely, hurting your productivity and your code quality as well.

In order to move towards a continuous delivery approach, the practice of trunk based development suggests ways to avoid this type of issues among others like inconsistent feature sets, code that stays in an undeployable state for a long time, regressions introduced by semantic differences that arise during those joyful merging sessions, integration surprises with the other features, and the like. Even if you are not a developer on your team you will benefit from the examples and techniques presented.

Short Bio

Carlos Lopes has been a software developer for over 7 years and has worked at different companies and environments, with different technologies and team sizes. He currently writes code while tackling some consulting challenges at ThoughtWorks Brasil.