COMMON POWERUp 2023

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