<table><tr><td style="">ngraham added a comment.
</td><a style="text-decoration: none; padding: 4px 8px; margin: 0 8px 8px; float: right; color: #464C5C; font-weight: bold; border-radius: 3px; background-color: #F7F7F9; background-image: linear-gradient(to bottom,#fff,#f1f0f1); display: inline-block; border: 1px solid rgba(71,87,120,.2);" href="https://phabricator.kde.org/D20863">View Revision</a></tr></table><br /><div><div><p>Now don't forget to merge to master. :)</p>
<div class="remarkup-code-block" style="margin: 12px 0;" data-code-lang="text" data-sigil="remarkup-code-block"><pre class="remarkup-code" style="font: 11px/15px "Menlo", "Consolas", "Monaco", monospace; padding: 12px; margin: 0; background: rgba(71, 87, 120, 0.08);">git checkout Plasma/5.15
git pull
git checkout master
git merge -s recursive -Xours origin/Plasma/5.15
git push</pre></div>
<hr class="remarkup-hr" />
<p>I have a handy shell function <tt style="background: #ebebeb; font-size: 13px;">kmerge</tt> that does this for me and then checks the result:</p>
<div class="remarkup-code-block" style="margin: 12px 0;" data-code-lang="text" data-sigil="remarkup-code-block"><pre class="remarkup-code" style="font: 11px/15px "Menlo", "Consolas", "Monaco", monospace; padding: 12px; margin: 0; background: rgba(71, 87, 120, 0.08);">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!
}</pre></div></div></div><br /><div><strong>REPOSITORY</strong><div><div>R119 Plasma Desktop</div></div></div><br /><div><strong>REVISION DETAIL</strong><div><a href="https://phabricator.kde.org/D20863">https://phabricator.kde.org/D20863</a></div></div><br /><div><strong>To: </strong>meven, ngraham, hein<br /><strong>Cc: </strong>hein, plasma-devel, jraleigh, GB_2, ragreen, Pitel, ZrenBot, lesliezhai, ali-mohamed, jensreuterberg, abetts, sebas, apol, mart<br /></div>