Loading…
Attending this event?
THE BEST IBM i & POWER SYSTEMS EDUCATION.When you come to POWERUp, you’ll be able to customize your experience. Choose from 300 sessions, covering over 20 areas of IT, when you plan your schedule. Visit the largest Expo of its kind and meet the experts behind the solutions. Attend social events to meet renowned speakers and peers alike. This conference is structured to give you the pure education and professional connections needed to best enhance your career. Are you ready to POWERUp?

Exhibitor Hall: https://www.expocad.com/host/fx/common/s24/exfx.html

Exhibitor Hall Map Here 
Back To Schedule
Monday, May 20 • 2:45pm - 3:45pm
235: 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!

Tweet Share
EVALUATION
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
Speakers
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 →

Monday May 20, 2024 2:45pm - 3:45pm CDT
Room 202 C-D 1508 Houston St, Fort Worth, TX 76102
  DevOps

Attendees (5)