Merge fixes

Updated 2,647 Days AgoPublic

Actions

Merge fixes

This will display under "Merge FIX" on KCI. Usually it is simple. The merge order is:
archive → backports → stable → unstable

Example:

git clone kubuntu:some-package
git checkout kubuntu_archive
git checkout kubuntu_backports
git merge

Fix any merge problems

git checkout kubuntu_stable
git merge

Fix any merge problems

git checkout kubuntu_unstable
git merge

Fix any merge problems