Source Control Suggestions

RickZeeland

See overview here: best-version-control-systems[^]

Kevin Marois

I have a solution with some projects in the same base folder, and other projects that are shared in different locations. When I right-click the solution and choose "Add To Source Control", a Git message pops up:

Source Control - Git

The current solution has projects that are located outside the solution folder. These projects will not be source controlled in the Git repository. To add all the projects to a single Git repository please consolidate all projects under a single folder.

This doesn't even make sense. I've heard too many horror stories about Git. This is one of them. See also [Git Catastrophes and Tips to Avoid Them | @RisingStack](https://blog.risingstack.com/git-catastrophes-and-tips-to-avoid-them/)

If it's not broken, fix it until it is. Everything makes sense in someone's mind. Ya can't fix stupid.

Kevin Marois

I actually have a server, and I've hosted SVN on it, but having the source in a repo in the same room as my dev PC doesn't keep me from losing the code if my house burns down. I could of course back up the SVN repo, but that's what cloud based systems are for. I guess I could set up backup of the repos to some cloud storage, but I'm looking for easy.

If it's not broken, fix it until it is. Everything makes sense in someone's mind. Ya can't fix stupid.

Kevin Marois

It sucks. [Git Catastrophes and Tips to Avoid Them | @RisingStack](https://blog.risingstack.com/git-catastrophes-and-tips-to-avoid-them/)

If it's not broken, fix it until it is. Everything makes sense in someone's mind. Ya can't fix stupid.

OriginalGriff

You shouldn't consider source control as a backup system - separate the concerns and implement a planned backup strategy, by all means in conjunction with source control. They really aren't there for the same things, and you sound like you need disaster recovery rather than source control. Backup to the cloud, or onto physical media which you rotate into a mates house (and perhaps rotate his into yours) instead.

"I have no idea what I did, but I'm taking full credit for it." - ThisOldTony AntiTwitter: @DalekDave is now a follower!

Ravi Bhavnani

Kevin Marois wrote:

With MS saying not to use VSTS, and I DON'T WANT GIT, what are my options?

I continue to use TFVC hosted at Microsoft. I'm allergic to Git (which is what I use at work). /ravi

My new year resolution: 2048 x 1536 Home | Articles | My .NET bits | Freeware ravib(at)ravib(dot)com

Kevin Marois

I never said source control was backup. I said doing source control on a server next to my Dev PC doesn't make sense in case the house burns down

If it's not broken, fix it until it is. Everything makes sense in someone's mind. Ya can't fix stupid.

Kevin Marois

Can you add new projects? My VS2017 won't let me use anything but Git

If it's not broken, fix it until it is. Everything makes sense in someone's mind. Ya can't fix stupid.

Ravi Bhavnani

Here's what I do:

Create the project in the web interface (and select TFVC as the version control system).
Create your solution using VStudio but don't "Add to source control".
In VStudio, use Source Control Explorer to add your solution folder to the TFVC project.
In VStudio, do File | Source Control | Advanced | Change Source Control and set the solution's source control bindings to the TFVC project.

After doing this, I work in VStudio as usual and check out and check in the solution's files normally. /ravi

My new year resolution: 2048 x 1536 Home | Articles | My .NET bits | Freeware ravib(at)ravib(dot)com

Maximilien

There are many horror stories with GIT and there are many more good stories with GIT. see also [Oh Shit, Git!?!](https://ohshitgit.com/) You know we use it, we're 10 developers, we all have multiple branches running in parallel, we have many version tags. We have a simple workflow In 4,5 years, I think we had one major issue (no data loss), I think it was because we busted the 1 gig repository size and needed to move files to the LFS system and rebuild the history. From what I can see, your problem seems to be related to the GIT in Visual Studio; I've seen some solution on StackOverflow; maybe not exactly like your situation, but it should be a good way to start looking at it. Maybe you could try an external GIT tool (tortoiseGIT, Kraken.... ) and see how it goes. Anyway, good luck:rose:.

I'd rather be phishing!

Ron Anders

I like Visual SVN. Free and works a treat. My SVN repositories are on my own Windows server down "at the shop" because I'm a control enthusiast.

Mike Hankey

I send SVN, i've been using it for many years. I've started to use GIT and can't decide if I like it or not. Still use SVN as backup though!

They call me different but the truth is they're all the same! JaxCoder.com

Rick York

Keep in mind that Git is a service. It is not solely supplied or hosted by Microsoft. They just own GitHub but there are also other sites that host Git servers. At work we use Bitbucket and they host both Git and Mercurial repositories. They also have both free and commercial accounts available. That's the only one I am somewhat familiar with and there are several others.

"They have a consciousness, they have a life, they have a soul! Damn you! Let the rabbits wear glasses! Save our brothers! Can I get an amen?"

Jacquers

git is fine if you use it right. It's branching is better than SVN. Get a UI like Sourcetree and use 'git flow'.

Sander Rossel

I've worked with Git for years and never amended anything. I don't get the issue with reverting. How would you solve that using TFSC or SVN? The fact is you pushed something that didn't work to the master branch, people made other changes to that code and now you want it removed. I've been in the situation where I had to revert multiple commits and this was as easy as selecting the commit I wanted to go back to and selecting "revert to this commit". As the author says, all backward changes were added to the branch, but my coworkers had some merge conflicts. Those conflicts are to be expected since I just messed up the whole code base that everyone was working on. SVN or any other SCM isn't going to handle that gracefully either... Actually, I don't recognize anything he talks about in that post, except this little sentence in the intro:

János Kubisch wrote:

Fortunately, it is really hard to irrevocably mess something up with git, as long as you have the .git hidden folder in your project intact!

In my experience it takes some getting used to. I worked in a team who worked with SVN for years and they were also a bunch of bunglers, so they complained about Git for years and never got the hang of it. Another team who moved to Git was amazed at how easy the transition was. At first, I thought it was overly complicated compared to SVN, but now I never want to go back. It's very easy to branch and merge, which makes developing new features and cooperating in teams so much easier. I wouldn't dismiss Git based on that one article... Just be sure to get some GUI tool. Not the default or the command line, those are for script kiddies who think they're so cool because they use command line. I use SourceTree or Visual Studio 2019 and those work well.

Best, Sander sanderrossel.com Continuous Integration, Delivery, and Deployment arrgh.js - Bringing LINQ to JavaScript Object-Oriented Programming in C# Succinctly

abmv

sourcegear..

Caveat Emptor. "Progress doesn't come from early risers – progress is made by lazy men looking for easier ways to do things." Lazarus Long

honey the codewitch

I use the builtin with VS 2017 and it works. I've only run into one major problem with it - it sometimes tries to push my entire Projects folder. But I've worked around the issue

When I was growin' up, I was the smartest kid I knew. Maybe that was just because I didn't know that many kids. All I know is now I feel the opposite.

Sander Rossel

honey the codewitch wrote:

it sometimes tries to push my entire Projects folder

Do you have a .gitignore? I've never used it before because I was missing stashing functionality. I used to like SourceTree A LOT better (VS 2015-2017), but with 2019 it's just slightly better I think.

Best, Sander sanderrossel.com Continuous Integration, Delivery, and Deployment arrgh.js - Bringing LINQ to JavaScript Object-Oriented Programming in C# Succinctly

honey the codewitch

I seem to, but it's intermittent problem so i think it's a bug. Overall this 2017 installation has been shaky at points.

When I was growin' up, I was the smartest kid I knew. Maybe that was just because I didn't know that many kids. All I know is now I feel the opposite.

Marc Clifton

Kevin Marois wrote:

and I DON'T WANT GIT

I used to hate GIT, but that was when I had to use the command line, which is incomprehensible. I now use SmartGit as the front end, and I'm quite pleased with the ease of creating branches, stashing stuff away to be applied later, merging branches, etc. I've never had a problem with it, and SmartGit's graph of branches is probably one of the more readable ones I've seen, not that I ever even look at those things when working solo on a project.

Latest Articles:
16 Days: A TypeScript application from concept to implementation Database Transaction Management across AJAX Calls