Relates to D20838
Details
Details
Diff Detail
Diff Detail
- Repository
- R119 Plasma Desktop
- Lint
Automatic diff as part of commit; lint not applicable. - Unit
Automatic diff as part of commit; unit tests not applicable.
Comment Actions
Please land this on the stable branch (Plasma/5.15) before tagging in two days, then merge to master. See https://community.kde.org/Infrastructure/Phabricator#Landing_on_the_.22Stable_branch.22
If you need help, don't hesitate to let me know!
Comment Actions
Now don't forget to merge to master. :)
git checkout Plasma/5.15 git pull git checkout master git merge -s recursive -Xours origin/Plasma/5.15 git push
I have a handy shell function kmerge that does this for me and then checks the result:
function kmerge { # Make sure the merge branch is up to date CURRENTBRANCH=`git branch 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/\1/'` git checkout $1 git pull # Do the merge safely git checkout $CURRENTBRANCH git merge -s recursive -Xours $1 # Verify it afterwards git diff origin/HEAD HEAD # Now push! }