Re:Comparing Git Workflows
by zzleeper on Thursday May 26, 2016 @11:49AM
(#11778878)
I am guilty of that. But what can I do? I use dropbox as a sort of backup (in case of a lost laptop or HDD failure), which doesn't work with git. When pushing to personal & private projects that's fine, but I need a better backup soln when pushing to a public repo..
[ Parent
| on HN ]
Re:Comparing Git Workflows
by icebraining on Thursday May 26, 2016 @11:57AM
(#11778970)
You can squash commits locally before pushing. I'm not a fan of "one commit per feature", but I still use interactive rebase on my personal branch to combine (or split) commits before merging it with an upstream branch.
To avoid cluttering the main repo but still have a backup, you can just use a fork (even just a directory on a remote server).
If you're working on branch `myFeature`, simply branch to `myFeature_BACKUP` and commit your entire working copy with commit message "WIP for the night; for remote backup only". Push this to the remote to back it up and protect against a lost laptop.
The next day, do a "reset --mixed" from the tip of your backup branch back to your last good commit on the feature branch. This brings all of the remote backup code into your working copy. From there, start work again and begin making staged commits of atomic changes.