Commit a58f1ffc authored by ljurk's avatar ljurk

add instructions for pulling with rebase

parent c73377e3
......@@ -5,9 +5,32 @@
- check your changes before commiting
- make small commits
## updating your working copy
### problem
If you commit to your working copy while someone pushes a commit to the remote repository and you try to push yours, you get an error: `failed to push some refs to remote...`. If you would do a `git pull` git would create a merge commit, this is ugly.
`git pull` = `git fetch && git merge`
### solution
see: https://www.atlassian.com/de/git/tutorials/merging-vs-rebasing
Append the paramter `--rebase` to the git pull command, to tell git to rebase insted of merge the remote changes.
`git pull --rebase` = `git fetch && git rebase`
in tortoiseGit you have to check the following checkbox to accomplish this:
![](img/pull-rebase.png)
## commit messages
Syntax: `BRANCHNAME - WEBPRG_NAME: MESSAGE (JIRA_ISSUE_NUMBER)`
Syntax: `WEBPRG_NAME: MESSAGE (JIRA_ISSUE_NUMBER)`
- describe why a change is beeing made in a meaningful way
- dont write code snippets in your commit messages, it should stay comprehensibly for non it people
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment