Skip to main content

WIP: Pulling and Pushing in Git

We are experimenting with following a workflow where everyone is allowed to work from and commit directly to the dev branch. This comes with a caveat of having your local version of dev frequently becoming out of date with origin/dev (the server's version of dev) as you are working on your local changes. This consequence often leads to a pitfall when pulling changes from origin/dev where contributors end up unnecessarily merging origin/dev into their local dev branch when what should have happened was to simply fast forward or rebase. This creates confusing cruft in the repo that makes it difficult to understand the progression of changes.