This page explains how to commit your changes on the project to the Git repository with GitKraken.
If you haven't setup Gitkraken already, take a look into GitKraken Setup.
¶ GitKraken UI
¶ Upload changes to the repository
¶ Pull Project
- Check that you are on the develop branch
- If not double click on the develop branch in the local or remote branches section
- Check that you don't have local changes (revert them if necessary, see "Resolve Conflicts / Revert Changes")
- Click the pull button
¶ Commit changes
- Stage Changes
- Click on the Stage all changes button if you want to commit all changes
- Or hover over the file you want to commit and click the stage button in the Unstaged Files field
- You can unstage changes by hovering over a file in the Staged Files section and clicking the unstage button
- Add a commit message in the commit message field
- The message should look like this: <type>: <Message>
- Keep the message short and descriptive
- type starts with a lower-case letter, the message starts with an upper-case letter
- E.g. asset: Add eye plane
- All types can be found here: Commit Types
- Click the commit button
- All changes in the staged field are committed with this commit
¶ Push changes
- Check that you committed all the changes you want to push to the repository
- Check that you're currently active branch is develop
- Click the push button
¶ Resolve Conflicts / Revert Changes
¶ If you have a conflict or want to revert a change to a uncommitted file, do the following:
- Richt-click on the file where you want to revert the changes in the Unstaged Files or Staged Files field and select Discard changes
- This reverts the file to the state of the last made commit before the changes
- This action is not revertable!
- In the popup that opens click Discard unstaged changes or reset
¶ If you want to revert a local commit which is not pushed to the repository do the following:
- Right-click on the last commit before the commit you want to revert and select "Reset to develop to this commit"
- If you want to keep your changes and like them to reappear in the staged/unstaged section select "Soft reset"
- If you want to delete your local changes select "Hard rest"