Version Control

Version control, also known as revision control or source control, is the management of changes to documents, computer programs, large web sites, and other collections of information. Changes are usually identified by a number or letter code, termed the "revision number," "revision level," or simply "revision." Version control systems (VCS) most commonly run as stand-alone applications, but revision control is also embedded in various types of software such as word processors and spreadsheets, and in various content management systems. Revision control allows for the ability to revert a document to a previous revision. Git, a widely-used VCS, has its own topic; other popular systems include CVS, Subversion, Team Foundation Server (TFS), Visual SourceSafe (VSS) and Perforce.

Share tech news, updates, or what's on your mind.

Sign up to Post

I just started using Visual Code Studio. A co-worker and I are working on a project together in which he will work on certain sections of the code and I will work on others.

We want to be able to "check out" a section of code, work on it locally and then post it up to be merged into the master code (upon approval).

I have seen ways to do what using github command lines. But is there a way to do that directly from Visual Code Studio?

What I'm looking for is this type of flow:

  • Start with the master code.
  • Each of us brings down files to our local machine to work on.
  • Our locally changed files are then staged to be uploaded.
  • The changes are reviewed and agreed upon.
  • The master branch is updated.

What I am looking for is a set of simple instructions for how this type of "checkout" procedure can be most easily accomplished and ideally from within Visual Code Studio itself.

Thanks.
0
Expert Spotlight: Joe Anderson (DatabaseMX)
LVL 13
Expert Spotlight: Joe Anderson (DatabaseMX)

We’ve posted a new Expert Spotlight!  Joe Anderson (DatabaseMX) has been on Experts Exchange since 2006. Learn more about this database architect, guitar aficionado, and Microsoft MVP.

Hello, I am in the process of implementing Acronis Snap Deploy in my environment and am wondering what other experts have done for version control of their master/base images?
0
I need whatever is in master branch to now be in my test branch named RM.

I definitely do not want to merge RM to master... I need it to be the other way around.
0
Hi,
I have seen two repo management tools that uses git.
One is phabricator and other is github
whats the difference between the two and what are the pros and cons of each
Which one to use when ?
Does one has some specific benefits over the other ?
Thanks
0
We currently host Git on our sandbox server where we (2, sometimes 3 people if we hire a temp contractor) collaborate on the code for our website. I'm new in this position of backend web dev, inheriting the position from our long time backend dev who moved on. I *was* the head IT guy but now I'm trying to figure all this out as part of my new job.

Is there a benefit to using GitHub as opposed to just having Git installed on our sandbox server?
0
Please provide reference(s) that git doesn't require system administration.

Earlier today I asked question is there a version control system that doesn't require system administration.  
Expert answered Git.

I could google this information.  Please provide some links that confirm that git doesn't need system administration.
0
From svn book,

"Unless you can outsource the administration of your version control system to a third-party, you'll have the obvious costs of performing that administration yourself"

Doesn't every version control system require administration ?
0
Is Tortoise SVN Client included with Windows File Explorer shell?  Or Tortoise SVN Client needs to be installed first, then it can be accessed from File Explorer shell?

When I right-click from File Explorer I don't see any svn commands, like checkout.  Is it because we haven't installed subversion in a server yet.
0
How can I edit two or three files in Github Enterprise and put them all into one pull request?
0
I want to commit my solution.
We have AnkhSVN installled in lan.  While comitting the solution, it shows following error :

Commit to https://mypc/svn/SampleProject
Commit failed (details follow):
Unable to connect to a repository at URL
 'https://mypc/svn/SampleProject'

The requested name is valid, but no data of the requested type was found.

plz see attached image . I am using VS 2015,   Ankh SVN 2.7.12815.  

From other computers in Lan ,  I can  commit existing project but cant add to new blank repository.
0
CompTIA Network+
LVL 13
CompTIA Network+

Prepare for the CompTIA Network+ exam by learning how to troubleshoot, configure, and manage both wired and wireless networks.

I have a bit of a different type of question. I'm trying to find a graphic or come up with a graphic that represents the benefits of version control.

Initially, I was just thinking of putting a company logo and version control logo and then a cloud platform logo on a page with connectors, but that doesn't really capture the benefits of version control.

When I think of benefits, I think of speed, backup, recovery, ease of deployment, etc.

So, I was trying to find a graphical representation of those types of benefits when using version. I thought someone on here might know of a graphic that already exists or might throw out some suggestions.


Thanks.
0
I just started learning git using source Tree.

I used mercurial hg workbench before and was quite comfortable with it. I usually created new feature/bug/ticket branch from the main branch to work on something. and if there were any updates to the main branch, I would pull the changes and merge the master branch into my local branch, to resolve any conflicts locally.

I imagine I can do similar in git using sourcetree. I am new to git and still reading about all the terminology around it, fetch, rebase, stash and so forth.

How would one usually achieve this in a team environment while using git.

say I'm working on a feature branch, and there is update to master branch, the one you know which will have lot of conflicts. so my idea is to do a pull on to my master branch. then merge that master branch into my local and resolve the conflicts locally .

how would i achieve this in git. do i do a pull, or fetch?
if i have uncomitted changes, do i stash my changes?
0
How do you find an ip address in one of many config files in a github enterprise repository? I've tried with quotes, without and I get all kinds of whacky variants but not the file with the IP address I want.
0
Hi Experts

Could you point what is necessary to allow external users to merge a Bitbucket repository?

The configuration I have uses Acess Level not private,  accordingly to:

img001
So I guess the people that wants to clone it simply must to run like this:
img002
Is that or anything else is necessary?

Thanks in advance
0
Hi everybody.
For some reason I ignore, a avi file has been copied or inserted in my local git repository and renamed as it be  an object. In Nautilus its icon shows the movie preview and if I double-click on it, I can watch the movie.
Now I can't commit my files so, once I have understood what happened, I have tried to delete it opening Nautilus as root or using sudo rm -i and the object name as it appears in Nautilus and in git error, but I get an error telling the file or the directory doesn't exist.

I can't just clone the repositories from BitBucket because it is not updated: I got this error some days ago but I had to go on with the work, so now I have a lot of changes not committed nor pushed.

I would like just to delete the movie from the repo but I don't know how to do it.

Someone can tell me what I have to do? btw, I'm new to Git and generally speaking not so confident with version control commands )

Thank you so much for any help.
0
I am going to put one of my servers at a datacenter and start hosting client's sites. I'm going to monitor the sites using pingdom, and I wanted to provide regular backups.

I wrote a shell script that backs up the database then pushes the repositiory to a private GitHub repo every 5 minutes.

Is running a Cron job every 5 minutes going to have an impact on my server's resources and load times?
0
Hi experts,
I have a c# solution which i've always just saved onto my local harddrive. I'd like to get this into VSTS so I can 1) use git for version control and 2) use the vsts scrum board to track the project. How do I get this out of my harddrive and into VSTS? I'm using visual studio 2017
0
When to use Git Merge and When to use Git Rebase ?

Practical Use cases or examples when Git Merge will be useful and Git rebase will be useful.
0
Looking to build a internet exposed host which receives Webhooks from Github to be forwarded internally.

- What is required here, for best practice - plan to do this on a VM - so hardware is fine.
- Are there any security risks - eg. ports open?
0
JavaScript Best Practices
LVL 13
JavaScript Best Practices

Save hours in development time and avoid common mistakes by learning the best practices to use for JavaScript.

I'm using Bitbucket for version control we have multiple feature branches. I made a commit to my feature branch, which has not been merged to the master branch. I'd like to rollback/remove the commit that I made to my branch. How do I remove that commit? I don't want that commit that I made to be included in my next pull request to the master branch so I'd like to just remove it. How can I do that?
0
Applying a partial SVN Patch using Tortoise

I see I can Apply an SVN patch, but worry that it's all or nothing.

Using Tortoise, if I select Apply Patch, then choose a file a Tortoise Merge tool opens.

Does this let me select the files I want to merge? What if there are wanted and unwanted changes in the same file?

Is there any way to revert?

What can I back up before I experiment with Applying Patches?

Thanks
0
Need to update shared C# code

We have four .NET MVC applications which use a shared C# file located in each of the four solutions at:

AppName.Web.Models.SharedClasses

and I am adding a new C# class.

I have yet to configure the NuGet package so it can be deployed across each solution and currently am using copy/paste to get the same code tested in each solution.

What can you tell me about the NuGet process?

Would I:

1) create the final source code in the shared project?
2) generate a NuGet package for those shared source files?
3) upload it to some server?
4) Using Visual Studio, opened for each target solution, update the NuGet containing the shared files?

Recompile each of four solutions and commit the updated code?

I am a bit unsure of this process.

Thanks.
0
Hi Experts

Could you explain what is the purpose of "Docker" use and recommend some good references on it?

Is it in some manner near "git" ?

From a day to another I had to start using this software.

There's a "pletora" of materials on internet but some of them could be more adequated.

Thanks in advance.
0
I was browsing repositories and accidentally opened a repository in github desktop 1.0.12. Now I see no means of closing it. What's the mojo?
ScrnGrab3506-180111-13.42.jpg
ScrnGrab3508-180111-13.44.jpg
0
I'm working on an Access app with primitive version control. How can I use COM (or anything else) to tell Access 2016 to compact & repair after launching? I'm assuming the answer will be in C# or powershell, hopefully the latter, as I'm looking to integrate it into commit hooks.
0

Version Control

Version control, also known as revision control or source control, is the management of changes to documents, computer programs, large web sites, and other collections of information. Changes are usually identified by a number or letter code, termed the "revision number," "revision level," or simply "revision." Version control systems (VCS) most commonly run as stand-alone applications, but revision control is also embedded in various types of software such as word processors and spreadsheets, and in various content management systems. Revision control allows for the ability to revert a document to a previous revision. Git, a widely-used VCS, has its own topic; other popular systems include CVS, Subversion, Team Foundation Server (TFS), Visual SourceSafe (VSS) and Perforce.

Top Experts In
Version Control
<
Monthly
>