3 ms·
This is basically how people use git-svn, because svn only understands rebase and not merge. I'm a lone git-svn user in a svn workplace, and I've been satisfie
by yonran 14y ago
This is basically how people use git-svn, because svn only understands rebase and not merge.
I'm a lone git-svn user in a svn workplace, and I've been satisfied following this basic workflow. I have my configuration differences, personal changes, and unfinished work in little commits on my branch. At the end of the day I rebase -i or cherry-pick onto the upstream git-svn branch, clean up the commits, and dcommit. At the beginning of each day I rebase yesterday's work onto the tip of upstream and continue working.
- e28eta 14y agoSame thing with git-p4, which is how I primarily use git. You do miss out on the benefits of distributed version control, but I really prefer it over working with Perforce directly.
- e28eta 14y agoSame thing with git-p4, which is how I primarily use git. You do miss out on the benefits of distributed version control, but I really prefer it over working with Perforce directly.