CODEWITHSUNDEEP
gitsvngithubtortoisesvngit-svn
Jerry.William.Ho
Jerry.William.Ho

Reputation: 37

How to conduct version control offline(without networking literally)？

Our team is developing the same software project on separate PCs(the networking is blocked due to our company rule), which is really a drug. Now, our developing flow is serial. When member A adds a feature, he had to wait B to finish development and get the copy of the B's project. So, here is my question:

Any suggestion will be appreciated?

Upvotes: 0

Views: 1886

Answers (3)

VonC
VonC

Reputation: 1326676

You can do a git bundle at anytime, and transmit that single file the same way you are currently getting a copy of B's project.

That file act as a git repo and does not need any server setup. Once received by the other party, he/she can simply pull from that file, and get the missing commitments.

I had to develop incremental bundles before.

Transmitting a repo as a single file limit the risk of data corruption during said transfer.

Upvotes: 1

Mykola Gurov
Mykola Gurov

Reputation: 8695

Another option for git would be to use git format-patch and git apply to exchange changesets in case parallel modifications are required. That is after the initial version of the repository has been copied to the parties.

Upvotes: 0

Lazy Badger
Lazy Badger

Reputation: 97285

how to conduct the version control when the networking is not allowed?

Easy, even it's SVN

Is there some best practices for this?

Yes. Keyword "branching and merging"

Is there some git implementation that allows us to create a git repository with having to setting up the server and the corresponding key

Yes. Default oridnary Git with remote, accessible with file:// protocol on both workplaces

Short draft

If everybody have wait to "...get the copy of..." you have NOW method to transfer data from location to location. Thus - just add some things

  • every workplace perform job in own branch
  • On transferred media normal repository is placed, known to local repo as remote target
  • On every location pull|push cycle performed and "foreign" work merged in own branch
  • When both (all) merges are identical (because they can differ at first step), any "workplace-branch" have to be merged to clean-by-convention mainline-branch

Upvotes: 0

Related Questions