Vincent van Ravesteijn <v...@lyx.org> writes: | If you keep the master branch clean, you can always safely 'git pull'. | Whenever you want to push a feature to the repo, you rebase it onto, | merge it into master and push.
Remember that is always safe to do a 'git fetch', and then you can use gitk f.ex. to have a look and decide on the best merging strategy: rebase or merge. -- Lgb
