The largest IBM i-related conference event in the world, bringing together the community of users, IBM, industry experts and solution providers.
Back To Schedule
Wednesday, April 26 • 10:30am - 11:30am
294: Git branch management for IBM i source; I want JUST the changes

Sign up or log in to save this to your schedule, view media, leave feedback and see who's attending!

One of the challenges of managing IBM i source with Git is we don't want to Build ALL of our objects for a few changes like a Java project. We want just the changes specific to our project. How do we get JUST those changes and what impact does that have on branch management, merging and conflicts? I thought Git made concurrent development easier, why is this SO HARD?

Now that we at Arcad have been providing Git integration for a number of years we have experience on why a rebase or a fetch from master can have unintended consequences. Well what do we DO with stale branches that conflict with master if we can't fetch? Ho can we just avoid a conflict or resolve it with the least pain?

Learning Objectives:
1, Recognize how IBM i source and business requirements require different branch management.
2. Best workflow for IBM i shops with concurrent development
3. Most efficient way to resolve or avoid merge conflicts

avatar for Jeffrey Tickner

Jeffrey Tickner

ARCAD Software
Jeff Tickner has worked in Change Management on the IBM I for 17 years at different companies. He is certified in Rational Team Concert as well has having experience with other Change Management packages from SourceSafe to Subversion. Jeff currently works for ARCAD Software, an international... Read More →

Wednesday April 26, 2023 10:30am - 11:30am MDT
Plaza Court 4