search

cimatosa / jobmanager

easy distributed computing based on the python class SyncManager for remote communication and python module multiprocessing for local parallelism
MIT License
6 stars 3 forks source link

use git pull --rebase #6

Closed cimatosa closed 9 years ago

cimatosa commented 9 years ago

Hey folks, let's see if we manage to use

'git pull --rebase' for minor merges which will lead to a linear master branch. I'd suggest to only use 'git merge' (which is done by calling 'git pull') when joining two major (feature) branches. see also here:

http://git-scm.com/book/de/v1/Git-Branching-Rebasing

http://stackoverflow.com/questions/18930527/difference-between-git-pull-and-git-pull-rebase

Richard

scholich commented 9 years ago

Alright. Seems like a good idea.

paulmueller commented 9 years ago

Thanks and agreed.