I have a local branch for day-to-day dev work in git. My workflow is:
It all works fine, however most of the recommendations I encountered say that one should not "push" private branches, on which rebase is regularly performed.
The problem here is that in this case local branch is not backed up to a server and the only way to save the work is to merge it back to "pushable" branch (i.e. origin/master)
What would be your recommendations on the workflow in this case?
Thanks!
UPDATE: I realised that one of the original requirements I had (avoiding usage of external utilities) is unnecessary limiting.
My current solution is to store all my repositories in a cloud-synchronised folder - this way I get backup for free.
Well, there is no such option like archiving branches in git. But we can create a tag with a prefix like “archive”. In other words, we move entry about the feature from branch list to tags list. To restore the branch, checkout it by the tag.
You can backup every file in your git repository by doing the normal git clone <git-url. git> command. By doing that, you download every file in your repository with their actual size and you can do git workflow in it. It's basically the usual way to clone a git repository.
I use the --mirror option and push to a personal backup repository:
Add it as a remote:
git remote add bak server:/path/to/backup/repo
Do the backup:
git push --mirror bak
This will automatically make your backup repository look like your active one -- branches will be created, deleted, updated (even forced/non-fastforwards) as needed. You can make an alias for this too:
git config alias.bak "push --mirror bak"
Then, it's just a matter of running "git bak" when you want to do a backup. You could also throw this into a cron job.
There's nothing wrong with pushing personal branches. It is generally discouraged because people might start work based on your branch, and when you rebase, their changes are left floating.
What I do is use a prefix to denote "this is my branch, use it on your own risk", like: fc-general-cleanup.
If you love us? You can donate to us via Paypal or buy me a coffee so we can maintain and grow! Thank you!
Donate Us With