< KritaRevision as of 19:38, 1 August 2016 by Dmitry (talk | contribs) (→Feature Branches Workflow)(diff) ← Older revision | Latest revision (diff) | Newer revision → (diff) Feature Branches Workflow All your work on implementing new features should happen in separate branches, not in master. Branch name should have the following structure <yourname>/<featurename> Merging of the branches to master is allowed during the 2-week merge window in the beginning of every 6-weeks release cycle Before merging the branch into master, you should make a review request for it. # switch to your branch git checkout your/branch/name # make sure you have pushed your work to the repository git push # fetch the latest changes in origin/master git fetch # generate a diff relative to the remote version of master arc diff origin/master NOTE: Make sure you didn't merge master into your branch manually right before generating a diff! If you did, arcanist will overwrite your merging commit. If he did, reset your current head to the latest pushed commit git reset --hard origin/<your/branch/name> Your review request text should be formatted as if it is a real commit. When you land the patch with arcanist, this text will be used for an actual commit. Use the following structure: One line short description of the changes Long description of the changed that happened lately in your branch with mentioning all the cute features it has and all the nice people you had to talk to to get the complete understanding of it. BUG:<bugnumber-you-fixed> Fixes T<phabricator-task-id-that-is-fixed> Ref T<phabricator-task-id-that-is-related-but-not-fixed> ## Add next line if your commit has features that need to be added to the Krita Manual Auditors:#krita_manual,#krita_website_and_translations ## Add next line if your commit has features that need to be publised in social media/site/twitter Auditors:#krita_website_and_translations Make sure you added a keyword to close the bug you have fixed Make sure you added a keyword to close or reference the Maniphest ticket you have been working on When you got the review and want to update your patch, do git push git fetch arc diff --update D<your-revision-id> origin/master When you have green light for merging your branch into master, land it with the following command: git checkout your/branch/name arc land --merge --hold Make sure you use --merge option to avoid squashed commit. Squashed commits break git blame functionality, so are highly NOT recommended. Use --hold option to not allow arcanist to push your changes. It will prepare the commit for you, so you will be able to check the message and probably edit it with git commit --amend After you checked the commit message and tags, push your changes to the repository Retrieved from "https://community.kde.org/index.php?title=Krita/FeatureBranchesWorkflow&oldid=72707" Content is available under Creative Commons License SA 4.0 unless otherwise noted.