|
learn GIT, it's a PITA, but it works.
I'd rather be phishing!
|
|
|
|
|
That's the argument that makes bad products the leaders in their branche.
Bastard Programmer from Hell 
If you can't read my code, try converting it here[^]
"If you just follow the bacon Eddy, wherever it leads you, then you won't have to think about politics." -- Some Bell.
|
|
|
|
|
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
If it's not broken, fix it until it is.
Everything makes sense in someone's mind.
Ya can't fix stupid.
|
|
|
|
|
There are many horror stories with GIT and there are many more good stories with GIT.
see also Oh Sh*t, Git!?!
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 | [Rose]](https://codeproject.freetls.fastly.net/script/Forums/Images/rose.gif) .
I'd rather be phishing!
|
|
|
|
|
That's because it's a visual studio error, not a git error. Git doesn't know anything about "solutions" - that's a VS thing.
|
|
|
|
|
|
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
|
|
|
|
|
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.
|
|
|
|
|
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
modified 30-Nov-19 18:43pm.
|
|
|
|
|
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.
|
|
|
|
|
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
|
|
|
|
|
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?"
|
|
|
|
|
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
|
|
|
|
|
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.
|
|
|
|
|
I use SVN and TortoiseSVN as the UI at work - they seem to be fine for what I need(creating branches, patches, merging etc).
“That which can be asserted without evidence, can be dismissed without evidence.”
― Christopher Hitchens
|
|
|
|
|
AHH, you gonna make me that person!!1!
Sorry ahead of time if just want some alternative.
Are the fears you have with GIT from personal experience of what you have read and been told?
My history: 4 years in software, some SVN used. Start using GIT on new project. 2 years go by with very little issue of a team of 3 people.
Get a new hire and in the first week things start breaking. Release went out which replaced a fix and compile time issues.
Cause: new hire was using command line to do all their GIT commits/pulls/push/sync.
Me just let them do their thing.
Another week, I cannot help them, because my command line experience of GIT is minimal.
This person claimed years of experience with GIT and blaming the team for doing it wrong, that their way was right.
Also did not help that they decided to rewrite much of the existing code in their style without checking if this was acceptable or what the requirements of those existing components were.
to end this rant: GIT is a tool.
First understand your CURRENT workflow.
How many people in the team?
Then look at a tool to help improve YOUR workflow.
I still look at unit tests with some detain, but when the that work helps show red days before release, it helps.
Simplest work flow: setup VSTS (azure devops) with Master as Pull Request only.
Make branch per feature.
Pull request viewer in devops, pull requests in general, consolidates multiple commits for easy pear review.
Mark delete branch on successful pull.
Issues with conflicts means in VS to sync YOUR master copy.
Merge master into the branch.
Review conflicts.
Commit, push.
The pull-request is updated and conflict removed, to allow for another review.
Im now in a team of 5 people, who have 20+ projects in Azure DevOps, some with multiple repos in them.
|
|
|
|
|
I have a $5/m DO droplet that hosts my private Git AND SVN repos. It still has about 18GB free space on it.
|
|
|
|
|
|
I use SVN with the repository hosted on a remote virtual server at GoDaddy.
|
|
|
|
|
I have used Perforce and found it very reliable and easy to work with. Integrates into Visual Studio. I would still use Azure Dev Ops (VSTS) as a default as it does everything I need it to do. Just need to remember to set the project up in the browser and then add files to it from Visual Studio.
|
|
|
|
|
I've been using social media for a long time now and lately, I've been feeling like social media is just adding to my anxiety and I tend to waste more time using social media than doing any productive work. 
In fact, I've thought of deactivating my social account and just go disappear for a while. Is it just me or do feel the same way? 
|
|
|
|
|
I decided that before I started using it ... 
"I have no idea what I did, but I'm taking full credit for it." - ThisOldTony
AntiTwitter: @DalekDave is now a follower!
|
|
|
|
|
does the Lounge qualify as social media?
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.
|
|
|
|
|
Maybe as antisocial media?
"I have no idea what I did, but I'm taking full credit for it." - ThisOldTony
AntiTwitter: @DalekDave is now a follower!
|
|
|
|
|
I walked away from Facebook years ago and I do not regret the decision.
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.
|
|
|
|
General 
News 
Suggestion 
Question 
Bug 
Answer 
Joke 
Praise 
Rant 
Admin 
Submit an article or tip
