|
We used it for daily builds of DLL's and the like. It gave us a way to keep binaries with the code without taking up a lot of space in the VSS database. You could check it out to keep it from being overwritten when you needed that.
It also allowed us (the developers) to manage the folder structure, security, etc. instead of the network folks. Other than that, it was pretty-much the same as a network folder.
|
|
|
|
|
MarkTJohnson wrote: I do long for the days of locking a file so no one else could modify while I was That 100% does not scale. If you're a team of two... fine. If you're an enterprise that flat-out fails on so many levels. You can't block one person from doing work while you lock a file. It's better to just learn how to merge.
Jeremy Falcon
modified 1-Nov-23 13:15pm.
|
|
|
|
|
I know how to merge, I just wish I understood why some things throw merge conflict when there is no conflict, you are just changing a particular line.
>>>>> New Code
This line says B
=====
This line says A
<<<<< Old Code
Why is that a merge conflict?
I’ve given up trying to be calm. However, I am open to feeling slightly less agitated.
I’m begging you for the benefit of everyone, don’t be STUPID.
|
|
|
|
|
Depends on the line and the direction of the merge.
Something like that isn't always a merge conflict. Sometimes it is... usually more so on a rebase than a merge in my experience. I've even seen whitespace trip git up. So, it's not perfect in the fact it will always be automatic.
That being said, even if git were bad at merges (it's not... it's better than most)... handling a conflict here and there is still better than preventing people from working.
Jeremy Falcon
|
|
|
|
|
Part is you can't just "learn" how to merge really. What needs to happen when the merge involves code you didn't author is often not so clear. So it's a sudden detour to getting anything productive done and we resent that. Sometimes merging can be massively painful and it just rises out of nowhere.
It's semi-predictable you may have to merge but not at all predictable what that might actually mean in terms of time/effort.
Will say though that some of the architecturally 'bloaty' paradigms help aid in merging being less a hassle because bits that may have been changes/revisions before are totally new bits. Basically, rather merge the new stuff than one of the old megamonolith apps.
|
|
|
|
|
MarkTJohnson wrote: of locking a file
I always saw that need as a very likely issue with architecture, design and/or project management.
For large teams the code should not be laid out in a way that results in this being a problem in any substantial way.
And for those cases where one or two files are central then it should be possible to layout out the project tasks so one can touch that file very quickly. For example if an enum is used widely then it should be in its own file (and perhaps own project/jar) and the project task should be to update it and do nothing else for that task.
modified 3-Nov-23 10:19am.
|
|
|
|
|
It seems MS itself is abandoning TFVC (or whatever name they give it this week) in favor of git, internally, or at least that's the impression I got back when I was working for someone who had a contract with them.
Is someone actually moving from git to TFVC, or have you changed companies, and the new one simply has never used git before and you're comparing your experiences?
|
|
|
|
|
New company.
I know they already have some products on git.
Moving to git is in the plan.
CI/CD = Continuous Impediment/Continuous Despair
|
|
|
|
|
Gotcha.
Since git is gaining so much in popularity, I just had to ask. Seems like everyone's moving in that direction, and not the opposite way.
Personally, I just use TFS through Visual Studio and I'm absolutely fine with it. Git, despite the support built into VS for it, seems to really encourage people to work at a command prompt. And frankly, when things go wrong, I'd rather figure out menu options than command line switches.
|
|
|
|
|
At work we moved from TFVC to Git in 2018. But all my personal code is hosted in TFVC. I personally prefer its ease of use.
/ravi
|
|
|
|
|
I worked with a strong proponent of Git. "Git's way more powerful". I understand that argument, but if TFVS/TFS/whatever does everything I need it to, with some simple right-click menus that aren't confusing...the extra power Git offers is lost on me...
|
|
|
|
|
True. Sadly, the "power of git" slows me down.
/ravi
|
|
|
|
|
dandy72 wrote: "Git's way more powerful"
Yeah, that only helps if you actually need more power. Maybe you need more control, and less power would be a benefit instead.
dandy72 wrote: the extra power Git offers is lost on me
The only "extra power" I know it has is that it's distributed, and I don't need that.
|
|
|
|
|
Get yourself a Git GUI, SourceTree, GitKraken, etc. Here's a list
10 Best Git GUI Clients for Windows in 2023[^]
I’ve given up trying to be calm. However, I am open to feeling slightly less agitated.
I’m begging you for the benefit of everyone, don’t be STUPID.
|
|
|
|
|
"10 Best Git GUI Clients"?
10? That's...not good. IMO. I use Visual Studio. I don't want to launch a separate tool just for source control. A Git client ought to be integrated with the tool that lets you write that source.
If MS can't do a decent job (and that seems to be the case), then it's got an extension architecture.
|
|
|
|
|
dandy72 wrote: If MS can't do a decent job
I agree. The Git integration in Visual Studio is much weaker than TFS'. I hope they improve it.
|
|
|
|
|
PIEBALDconsult wrote: The Git integration in Visual Studio is much weaker than TFS'. I hope they improve it.
There's hardly anywhere else to go, IMO.
|
|
|
|
|
I've been using Git in VS for several years, and never had to use a command prompt for anything. The UI always provided everything I needed.
|
|
|
|
|
More power to you. Everybody should be blessed with that sort of experience.
Maybe what we did deviated from what was made available through the GUI, but we were strongly encouraged (by those who were familiar with the system) to "just do everything from the command line".
|
|
|
|
|
That is not unusual. There are a lot of people whose experience came up through non-Windows OSs that had nothing but a command line in most cases. They tend to want to force that 1990s way of interface on others now.
My point is that using Git in Visual Studio has been around with a GUI interface for years. If the less informed (like those telling you to use command line) choose not to use it, that is their problem, and it sounds like they made it your problem with which to deal. Sorry they hold you back like that.
|
|
|
|
|
Maybe I haven't made it sufficiently clear in the thread.
At the time, the company I worked for was on contract with Microsoft. You know, makers of VS and TFS. Those Microsoft people we contracted with were using Git, not TFS, and there was a very strong push, coming from them, to do everything at a command prompt.
These are not folks who don't know Microsoft products, or how to use VS or TFS.
Maybe I shouldn't be saying this publicly, but I'm not naming who I work for, nor the team at Microsoft we were working with. But internally, there's more and more support for Git - at TFS's expense.
|
|
|
|
|
You were clear. Microsoft, especially under the current CEO, suffers from a lot of command line, Linux-oriented developers and program managers who know little or nothing about MS’s past with GUI tools.
Even with visual tools that do all that is necessary, those oriented towards command line tools will still pretend a command line is needed.
I am not surprised you had folks at MS tell you that. I agree that they were sincere in their advice, just sincerely wrong.
That same mentality is why the software engineers (Alan Cooper’s team) back in the 1990s created a very useful GUI builder for Visual Basic (later ported to Visual Studio). But when extending Visual Studio to mobile apps (Xamarin Forms/MAUI) and web (Blazor), MS software engineers of the caliber they had in the 1990s and 2000s were long gone, and the command line oriented software engineers and program managers were not advanced enough to know how to build GUI builders for mobile and web, or to understand the significant value in them.
MS development tools suffer from not having visual designers, limited to the archaic “hot reload”.
The advice given to you about command line use of Git fits right in with a much wider engineering deficit at MS.
|
|
|
|
|
MSBassSinger wrote: back in the 1990s created a very useful GUI builder for Visual Basic
Having worked on a system that specifically was intended to build UIs long ago and having worked on a CMS (Content Management System) for the past 5 years that is used to build very large company sites I believe I have a bit of knowledge on such attempts...
And that is that UI presentations are never sufficient enough to do everything that knowledgeable individuals want to do.
|
|
|
|
|
And yet the WinForms GUI builder was so successful that other companies (like PowerBuilder) tried to copy it. It has successfully made Windows apps, including complex ones, to this day.
It isn’t that it can’t be done - it has already. It is that it has not been tried with a team capable of the same level of quality and excellence as Alan Cooper and his team had.
|
|
|
|
|
FYI
Power Builder predates even Visual Basic (codename Thunder) which means it almost predates the public internet.
I worked on a PowerBuilder 2.0 project talking to a DB running on OS/2!
It had form inheritance/templating at that version. Circa 1991.
|
|
|
|