Key Git Concepts Explained the Hard Way

Re:Key Git Concepts Explained the Hard Way by dotancohen on Thursday March 15, 2018 @03:26AM (#16590994)

I recently had to do something similar with an ancient SVN repo, that had to stay in SVN.

I simply started a git repo in the same base directory as the SVN repo, and did my work in there. Every time I merged a branch back to master I committed to SVN's ^/branches/dev. Just add `.svn` to `.gitignore` and `.git*` to the SVN prop ignore.

You _will_ want to merge from upstream (Whatever Perforce's equivalent to `svn up` or `git pull` is) often, I was merging from upstream before every SVN commit (SVN mostly forces you to do this, `svn status --show-updates` is a huge help here but I don't know if Perforce has a similar feature).

[ Parent | on HN ]

Re:Key Git Concepts Explained the Hard Way by erik_seaberg on Thursday March 15, 2018 @11:09AM (#16593473)

There are googlers who do the same thing, mostly work in git until the branch is ready for one big perforce changelist to review and commit.

[ Parent | on HN ]