D20863: Allow folder view elements to be be dropped using other Action than Copy

[Méven Car]

meven added a comment.


  In D20863#461260 <https://phabricator.kde.org/D20863#461260>, @ngraham wrote:
  
  > 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!
  >   }
  >  
  >
  
  
  Done thanks
  
  I am always worried to merge others people work.

REPOSITORY
  R119 Plasma Desktop

REVISION DETAIL
  https://phabricator.kde.org/D20863

To: meven, ngraham, hein
Cc: hein, plasma-devel, jraleigh, GB_2, ragreen, Pitel, ZrenBot, lesliezhai, ali-mohamed, jensreuterberg, abetts, sebas, apol, mart
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/plasma-devel/attachments/20190506/67e58054/attachment.html>