aprcela added a comment.
In D29006#670660 <https://phabricator.kde.org/D29006#670660>, @meven wrote: > Rather than merging master into your branches, I would recommend you rebasing ;) Ok, thanks for the information! :) REPOSITORY R318 Dolphin BRANCH arcpatch-D29006 REVISION DETAIL https://phabricator.kde.org/D29006 To: aprcela, #dolphin, elvisangelaccio, ngraham, meven, dfaure Cc: yurchor, kde-doc-english, dfaure, meven, kfm-devel, waitquietly, azyx, nikolaik, pberestov, iasensio, aprcela, fprice, gennad, fbampaloukas, alexde, Codezela, feverfew, spoorun, navarromorales, firef, ngraham, andrebarros, skadinna, emmanuelp, rdieter, mikesomov
