Working with Multiple Releases

Main Branch

Main Branch - Reserved for Spring 2.x Dev stream

Spring AI 1.x Development

Branch - 1.0.x

Process:

git fetch origin
git checkout -b 1.0.x origin/1.0.x   # if local branch doesn't exist
git pull origin 1.0.x

git checkout -b abc                  # create working branch
git add .
git commit -S -m "Your commit"

git push -u origin abc               # publish working branch, auto-create remote abc

# GitHub PR:
# Base: 1.0.x
# Compare: abc

git checkout 1.0.x
git pull origin 1.0.x                # after PR merge

Which Branch should I commit to?

Recommendation:

• new feature development - Main branch
• bug on 1.0.x - to be committed into main too
• bug on main - may or may not be committed back to 1.0.x, depends upon bug nature