Git-workflow

Initialize

To initialize your repo do: * make fork from https://github.com/ostis-dev/sc-machine * clone your fork to your machine and prepare

git clone git@github.com:yourlogin/sc-machine.git
cd sc-machine
git config --global user.name "Your Name"
git config --global user.email youremail@example.com
git remote add upstream git@github.com:ostis-dev/sc-machine.git

Update

To update your master from upstream use:

git fetch upstream
git checkout master
git merge upstream/master
git push origin master

Rebase

To rebase your branch to master:

git checkout yourbranch
git rebase master

If you have any problems, then: * redo

git rebase --abort

* ask in

Common rules

• use git rebase instead of merge. More documentation about this command This command just try to apply your commits (from current branch to commits in specified branch)