Register a SA Forums Account here!
JOINING THE SA FORUMS WILL REMOVE THIS BIG AD, THE ANNOYING UNDERLINED ADS, AND STUPID INTERSTITIAL ADS!!!

You can: log in, read the tech support FAQ, or request your lost password. This dumb message (and those ads) will appear on every screen until you register! Get rid of this crap by registering your own SA Forums Account and joining roughly 150,000 Goons, for the one-time price of $9.95! We charge money because it costs us money per month for bills, and since we don't believe in showing ads to our users, we try to make the money back through forum registrations.
 
  • Post
  • Reply
Belgarath
Feb 21, 2003
I have to use Sourcesafe at work (I know, but it's out of my hands), but I've started using Git for my personal stuff. I was wondering if I could use Git at work, so that I could init a Git repo in my sourcesafe checkout, do some work, make some branches in Git, and then check back into sourcesafe after merging my Git branches into master?

i.e. the checkout from sourcesafe would be the Git master, and I do all my work in branches, merging back to master when I'm happy, and then checking back into sourcesafe.

It doesn't sound all that unreasonable to me, assuming I setup my .gitignore file to ignore the relevant Sourcesafe files.

We're moving from Sourcesafe to Clearcase soon too :( If only I could convince them to buy into Git and get Github:FI

Adbot
ADBOT LOVES YOU

Belgarath
Feb 21, 2003

wwb posted:

I think the bigger problem you'll have to deal with, vis-a-vis sourcesafe, is the whole making files readonly/locking stuff nightmare.

The Sourcesafe integration with Visual Studio handles all that at the moment (when you edit the file, it checks it out and makes it writeable, vice-versa on check-in), although as you say, it is a concern of mine that once I break that link, things could go a little haywire. I'm not sure if Visual Studio will make a file writeable that it doesn't think is under version control.

  • 1
  • 2
  • 3
  • 4
  • 5
  • Post
  • Reply