...
The pull request command that all contributors will use is the "/integrate" command that integrates an approved pull request into a repository. This is a example where the Skara workflow differs slightly from the workflow offered by most external Git source code hosting providers - almost all external Git source code hosting providers require that a reviewer/maintainer integrates a pull request into a repository. Skara instead enables the contributor to integrate the pull request with the "/integrate" command, but the contributor can only issue the "/integrate" command once the pull request passes all pre-integration checks (e.g. jcheck).
The "/integrate" command will by default squash all commits in the pull request into one, rebase the resulting commit on top of the target branch and automatically create an appropriate commit message. The squashing of all commits in the pull request enables contributors to update a pull request by simply pushing to the branch in the contributor's personal fork the pull request was created from. The rebasing of the resulting commit enables contributors to simply merge the target branch into the source branch for the pull request whenever changes from the target branch needs to be incorporated (instead of doing complicated rebases and force pushes). The automatic formatting of the commit message frees contributors from having to consider the details of the commit message format.
An hash can be supplied to /integrate and in that case an atomic integration is performed. An atomic integration squashes and rebases on the commits on top of the given hash, and then tries to push the result. An atomic integration will fail if the supplied hash is not the head of the target branch at the moment of the push. This mean that you can be sure that if you supply a hash to /integrate, then your pull request will only be squashed and rebased on top of the given commit, nothing else. This can be useful for large and complicated changes when you are unsure about potential conflicts with other commits.
Examples
/integrate/integrate 38d3c3d937675ac5d550659825b7e99ed1eb3921
/sponsor
Syntax
/sponsor
Description
Marks you as the sponsor of the pull request. A pull request made by a contributor who is not a Committer can not issue the /integrate command until a Committer in the project has issued the /sponsor command.
Examples
/sponsor
/solves
Syntax
Description
Examples
...
Overview
Content Tools
ThemeBuilder