Skip to content

How to make changes affecting base system

Martin Vidner edited this page Aug 27, 2013 · 2 revisions

Why

OpenSUSE has system feature freeze after a certain milestone, so all changes should go to separate branch. And when development for such openSUSE is moved to maintenance branch, then the separate branch is merged back.

How

Changes for next opensuse should go to branch next_opensuse. The branch can be quite big, so do not directly push to it, but create pull requests against such branch, so code can be properly reviewed. Master branch should be properly merged to next_opensuse branch.

Practical howto

# create next_opensuse branch
git checkout master
git pull
git checkout -b next_opensuse
# do not push anything else to this branch
git push
# create pull request against next_opensuse branch
git checkout next_opensuse
git pull
git checkout -b my_fix_to_next_opensuse
... # hacking + git commit
git push
# in github UI create pull request and change base branch to next_opensuse
# merge master into next_opensuse
git checkout next_opensuse
git pull
git merge origin/master
Clone this wiki locally