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 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
Cloud Class® Course: Microsoft Azure 2017
LVL 12
Cloud Class® Course: Microsoft Azure 2017

Azure has a changed a lot since it was originally introduce by adding new services and features. Do you know everything you need to about Azure? This course will teach you about the Azure App Service, monitoring and application insights, DevOps, and Team Services.

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
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
Cloud Class® Course: MCSA MCSE Windows Server 2012
LVL 12
Cloud Class® Course: MCSA MCSE Windows Server 2012

This course teaches how to install and configure Windows Server 2012 R2.  It is the first step on your path to becoming a Microsoft Certified Solutions Expert (MCSE).

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
I have used Octopus Deploy but never Jenkins.

What are some big differences?

Thanks
0
This is using the SVN (subversion) to control the version number of the code. The source server is an VM using CentOS 6.4, while the destination server is a redhat Enterprise linux 6.7. Both Linux systems are installing SVN by yum, for example, yum install subversion, and yum install mod_dav_svn. apache (httpd) was utilized. The version of SVN is 1.6.

As for the SVN structure, the httpd.conf located in /etc/httpd, while all SVN repository config are put in /etc/httpd/conf.d. However, all SVN repository are stored in /home/svn. As for the user authentication, LDAP is in used, in which this pointed to our MS Windows AD Domain. Both systems were setup in the same fashion.

Now, selective repositories are needed to be migrated from CentOS to redhat linux. The redhat linux SVN server is working now. However, as for the old centOS svn server, those affected repository still kept but none of them should allow committed or updated.
Is there a way to "lock" all the files and folders of those affected repository, sounds like using "svn lock" or else? Or only allow those users to read-only but not write?

Please help, thanks a lot.
0
I hope to post a sample application which displays a problem I am having and need to find what aspects I need to create for this. It would mainly be for posts on EE but could be used to share my code for other purposes.

Can you suggest one?

I create a GitGub account and use Git to put the latest version of my site to GitHub.

What if two people want to make an alteration to the code I post there? When someone makes a change, is there a way to auto-fork the repo?
0
Experts, please let me know if there is any free client utility that I can use for GitHub Enterprise. I think SourceTree supports GitHub.com, but not GitHub enterprise, please correct me if I am wrong. For some reasons, GitHub Desktop version can't be used. Please let me know if there are any other utilities that I can use to connect to my office GitHub repository.
0
How do I add developers to the bug assignments list in tfs 2015?

My tester is adding bugs to a project and is complaining that there are no developers in the drop-down list of developers to assign the bug to... I'm not familiar with using TFS as a testing platform; is there a TFS role the developer need to be in?
I guess the base question is: What feeds the bug assignments drop-down list?

Thanks
0
we have a repository with 1 branch and 1 trunk in SVN, working on the daily change on the branch and after a week or so we pass the changes into the trunk using tortoise merge and later we continue using the branch to make more changes and so on. this way we think that can save al changes while maintaing a stable realease to build.

this way of working is recommended or we are wrong?

regards
0
Cloud Class® Course: Ruby Fundamentals
LVL 12
Cloud Class® Course: Ruby Fundamentals

This course will introduce you to Ruby, as well as teach you about classes, methods, variables, data structures, loops, enumerable methods, and finishing touches.

I inherited a bit of a mess
I have a project where the LIVE web site is correct on a production server.

There is a project on a local server for the same web site.

I KNOW the live site is correct

There IS a github repository

I want to ONLY push the live site UP...
NOT receive anything FROM the repository

And then get the dev site in sync.

How do I do that?
0
Hello

I'm reading a lot about devops and the new culture behind it.

I m yet puzzled at few issues that I would appreciate some experienced in that field to help me out with.

1-most of the posts and documents I am reading are for a big part emphasizing on testing and how to conduct all types of testings. Is that correct? I mean is really testing the cornerstone of the devops?
2-In my company we are using a web development platform called alphaanywhere and planning to also use instantdeveloper who both are RAD tools.
All the tools that are being advocated by for devops seem to me to work ONLY under Java python rubis and the likes..
I hear a lot of Jenkins / bamboo / git / chef / puppet...
It seems to me that all those tools do not work under the platforms I am using. (Alphaanywhere and instantdeveloper).
I'm a right? If yes then Devops can not be applied in my company? It doesn't make sense to me.
I'm certainly missing something... Please help me understand...

Thanks
0
I'm new to, and using Git. I have my remotes/origin branch of "master" that contains all production-ready code.

From "master", I create a new local branch called "Bug Fixes".

When I try to push code changes in Bug Fixes back to "master", I get this error every time:

Error encountered while pushing to the remote repository: Not a valid reference 'origin/master'

Maybe I'm not using this correctly? Can someone please advise?
0
I am the only one with Admin rights to BitBucket and want to be sure, for the moment, only I can merge a Pull Request.

Please explain how to configure this...

Thanks
0
I just need to be alerted (via email) when a Pull Request is created.

How?

Thanks
0
A slightly theoretical question.

A company is developing a cloud service based on PHP/mySQL etc. They have the source code on their own servers.

However, they want to start using external developers to create particular features.

How can they share part of the source code with those developers, without giving them access to the whole thing?

I was thinking that something like GitHub might support that, but it doesnt appear that it does.

Any ideas, or products you know of?
It would essentially be giving a certain developer access to a certain file, and then revoking that access when they had completed their work. I guess it would also need some sort of version control.
1

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
>