D29325: Implemented Bahtinov mask focus assistant, fix compiler warnings (in fpackutil.c and modcalcvizequinox.cpp)
Eric Dejouhanet <[email protected]> Sat, 2 May 2020 08:24:53 +0000
| Newsgroups | gmane.comp.kde.devel.education |
|---|---|
| Message-ID | <7e4c03b06ecf697482ed33f5161a1983__14721.446977795$1588407923$gmane$org@localhost.localdomain> |
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