[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-panel-devel
Subject:    Re: UI refactor
From:       "Aaron J. Seigo" <aseigo () kde ! org>
Date:       2013-05-14 13:33:19
Message-ID: 1369956.pmy086vHBG () freedom
[Download RAW message or body]

[Attachment #2 (multipart/signed)]


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
["signature.asc" (application/pgp-signature)]

_______________________________________________
Plasma-devel mailing list
Plasma-devel@kde.org
https://mail.kde.org/mailman/listinfo/plasma-devel


[prev in list] [next in list] [prev in thread] [next in thread]