UI refactor
Aaron J. Seigo
aseigo at kde.org
Tue May 14 13:33:19 UTC 2013
On Monday, May 13, 2013 20:10:38 Shantanu Tushar Jha wrote:
> it will take some effort. Have you tried merging master into your branch?
you usually do not want to merge master into a branch that will later be
merged back into master as the resulting log in master will be less than
pretty over time.
since git.kde.org doesn't support forced pushes you can't rebase the branch
and push it. so usually the merge is done in a new branch and the old one
deleted after the new one is pushed.
seeing if this is necessary at all is quick and easy: try merging the branch
in question into master and see if there are conflicts. if there are .. then
you know you need to do the above. if there aren't, then simply get the branch
finished up quickly so it can be merged.
--
Aaron J. Seigo
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: This is a digitally signed message part.
URL: <http://mail.kde.org/pipermail/plasma-devel/attachments/20130514/30dfc504/attachment.sig>
More information about the Plasma-devel
mailing list