D29325: Implemented Bahtinov mask focus assistant, fix compiler warnings (in fpackutil.c and modcalcvizequinox.cpp)
Eric Dejouhanet
noreply at phabricator.kde.org
Sat May 2 09:24:53 BST 2020
TallFurryMan added a comment.
Well, we could redo this from the beginning.
You locate the commits that contain your changes and fixes (not the merges, let's leave those). You write down the commit identifiers.
You check `kde/master` out, and you derive a new branch from that with `git checkout - tb new_bahtinov_attempt` (`-b` will fork, `-t` will track).
You then sequentially apply your changes with `git cherry-pick <commit-id>`, resolving conflicts as they appear.
Then you push your changes with `arc diff --update D29325 kde/master`.
REPOSITORY
R321 KStars
BRANCH
bahtinov-mask-focus-process-review-comments (branched from master)
REVISION DETAIL
https://phabricator.kde.org/D29325
To: astrorunner, #kstars, TallFurryMan, mutlaqja
Cc: mutlaqja, TallFurryMan, kde-edu, narvaez, apol
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/kde-edu/attachments/20200502/fadb16f2/attachment.html>
More information about the kde-edu
mailing list