top | item 11223313

(no title)

denniskubes | 10 years ago

We use a fork model where each developer has their own fork of the "main" repository and the developer fork is cloned to the local dev machine.

Using this model I do work in progress commits as needed for different features using many different branches. Those wips and committed locally and are pushed to the remote fork many times per day for backup. For example I can do a quick push before going to lunch or meeting. I can also fetch, rebase, squash, and force push commits as desired because the only history I am affecting is on my own fork. The final merge to the "main" repository is usually 1-2 commits squashed from all the wip commits. Once that is merged I, since I am usually working on a feature branch, I can delete that branch locally and in the remote fork.

Every 30 seconds seems like a bit much, but it wouldn't be unreasonable to say I commit and push 10x a day.

discuss

order

No comments yet.