Expiring Today—Celebrate National IT Professionals Day with 3 months of free Premium Membership. Use Code ITDAY17

x

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

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
Free Tool: SSL Checker
LVL 10
Free Tool: SSL Checker

Scans your site and returns information about your SSL implementation and certificate. Helpful for debugging and validating your SSL configuration.

One of a set of tools we are providing to everyone as a way of saying thank you for being a part of the community.

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
We very recently just completed a move to a brand new system for our company (ConnectWise) and it includes a KB style documentation feature but does not have any version control.  I'd like to take advantage of using the piece built in to the software but need a way to keep older versions of the articles.

The articles are stored as rows in a specific SQL table, and I can't rewrite the internal code.  I'm trying to avoid a SQL trigger, but it might be the only way to accomplish what I want, which would be before an insert or update to duplicate the row to another table with a version # and date.  

Is there another way to handle this that you [Experts] can think of?  If not, how could I do the trigger to duplicate the row before it's updated without interrupting the software's process?

Appreciate the advice/brain storming in advance.
0
Hello,

I have a simple Hello World program written in Eclipse Neon.  I am integrating Eclipse with Github and it is giving following error. The Pull works from the repo.  What could be wrong here?

Thank you
Screenshot_1.png
0
I've been using Visual Studio Online for some time with a TFS-style repository.  I've started a new job and am creating a new repository for our small time and want to use git for the first time.  I'm really struggling with importing existing projects to this git style repository and then sharing it with team members. Are there any primers out there for users like myself getting to grips with git in a visual studio environment?

In case it's relevant, we are using VS 2015.
0
On Demand Webinar - Networking for the Cloud Era
LVL 10
On Demand Webinar - Networking for the Cloud Era

This webinar discusses:
-Common barriers companies experience when moving to the cloud
-How SD-WAN changes the way we look at networks
-Best practices customers should employ moving forward with cloud migration
-What happens behind the scenes of SteelConnect’s one-click button

I made the mistake of making some changes on my local "develop" branch. This branch is set up so if I do "git pull," it will align with the "develop" branch on the main server.

After realizing my mistake, I went ahead and committed my changes, then I renamed the "develop" branch to management/server. My rationale was that I change the name of the branch, create a new branch called "develop" and do a "git pull" to grab all of the files from upstream and I would be good to go. When I did that, however, I got an error that said:

"There is no tracking information for the current branch. Please specify which branch you want to merge with."

Not sure what that meant, but I went online and found a command that seemed to do the trick. I did this:

git branch -u upstream/develop

Thing is, my interface says I'm still one commit ahead of upstream. I want to overwrite what I've got on my local "develop" branch with the "develop" branch that's sitting on the main server.

How?
0
Setting up a service account for the TFS Build Services and need to know what all permissions this service account will need. I have looked all over and can only find that it needs the Log on as a Service permission.

Where can I find what all permissions this account needs?
0
What values do I need to set in order that the event fires every midnight?

Octopus Fields for Scheduled Event
0
I want a link from /home/svn to be available in /mnt.

My path in apache is /mnt/svn.........

I created the svn link in /mnt but when I try to access from a browser I get path not found.

Any suggestions on how to get this to work. All of my storage space for the web page is in /home. I tried mounting svn in /mnt but it is not seen that way either.

I would rather have the link in /var/www but I cannot create the link there.
0
We use Gitlab as a repository tool and we have a  master branch and stable branch.when ever we want to build using jenkin, it has to taken from the master branch and if the build is successful it has to move to stable branch. How I should tag the master branch and how I should merge with the stable branch..let us know
0
I have 25 Word Docs which represent 25 snapshots of this paper I have been writing, where I created a new copy before I made a change in direction and deleted some text. So I made a new filename so I would not over-write any copy, but now I need to "mine" all that old text which had ben abandoned.

I want to make a "mashup" version of the file so I can proof it for ideas on topics that I abandoned months ago.

How do I do this?

I tried the merge feature of Word, but found it did not merge the docs as expected. I want to use some merge feature so that I do not make the doc longer than needed by releasing the same paragraphs and pages. Instead, I understand there will be no meaning to this text, expect it will remind me of the topics I abandoned.

I also tried exporting them as text, then using Beyond Compare to merge them, but once again, it did not combine the files.

Is there a way to extract all words in a file as a CSV file? If I could get that for each file sandpit them into one huge Excel Column, I could scan that column and at least find key words, while key concepts would be impossible to uncover...

Any ideas?

Thanks.
0
I am a developer and love Git. But I am writing a book and rely on Word. But Word files and Git are oil and water, since it can easily mangle the file and render it useless. Right?

How about using an RTF? Is that a format which works with source control?

I am sure a Notepad style of crude editor wold work, but I need some basic styling like font, bold, italics, etc.

What tool can I use on a Mac to write this book? I really want to be able to commit and push revisions and make my incremental changes viewable by me later.

Thanks.
0
Hi,

When i try to get forked project from github getting attached error in git hub when i selected github from drop down.

how to resolve this. please advise
intelligjEr.png
0
I am  a Git newbie, I have tried  to  follow  this  doc  below but I keep getting errors:

.1)Set your master branch to track the original repo's master branch.

        i.)  git checkout master
        ii.) git branch -u   matestream/master

Steps  Take
  I.)  I  went and checkout master  branch

     lugalaf@ITWEBDEV01 MINGW64 /c/Applications/TeamMates/teammates (master)
 II.)Then  I  issued second command and  got  the following error:-

$ git branch -u  matestream/master
error: the requested upstream branch 'matestream/master' does not exist
hint:
hint: If you are planning on basing your work on an upstream
hint: branch that already exists at the remote, you may need to
hint: run "git fetch" to retrieve it.
hint:
hint: If you are planning to push out a new local branch that
hint: will track its remote counterpart, you may want to use
hint: "git push -u" to set the upstream config as you push

Open in new window

.


When  I  do    git   remote  to confirm my  remote  branches, I found  the branch is already there.Anything I am missing please?

 
 $ git remote -v
        matestream      https://github.com/TEAMMATES/teammates.git (fetch)
       matestream      https://github.com/TEAMMATES/teammates.git (push)
        origin  https://github.com/FrankSD/teammates.git (fetch)
        origin  https://github.com/FrankSD/teammates.git (push)

Open in new window

0
On Demand Webinar: Networking for the Cloud Era
LVL 10
On Demand Webinar: Networking for the Cloud Era

Ready to improve network connectivity? Watch this webinar to learn how SD-WANs and a one-click instant connect tool can boost provisions, deployment, and management of your cloud connection.

I have one Hyperlink that's underlined, has an anchor, and is blue. I want to use the Style Paintbrush to copy that, but it removes the Anchor.

How can I make the hyperlinks all appear blue and have the same font and point size?
0
we have an angularjs2.0 application running on nodejs server.The version control tool we use is Gitlab. is it possible to Automate the integration of gitlab on AWS .Any url or steps to go through
0
Hi Experts,
Is there a way to bulk edit work items in Visual Studio Team Foundation Server 2015, using Excel?

Thanks in advance for your help,
mrotor
0
I created new workspace in eclipse.  Then, I created a 'C' language Project within this workspace.

I used SVN Command Line Client from windows command prompt to checkout  C Source code from Repository into this Project folder.

Now, the project folder in windows explorer has the checkout source code but this source code doesn't appear in eclipse project folder.  Eclipse Project Folder is empty.

I tried to drag source code into eclipse project explorer.  I also tried copying source code from windows explorer project folder to eclipse project folder but there is error message:    "Cannot import 'trunk'.  The source and destination are same."
0
Attached is the version of svn client I'm using.
 
C:\> cd Projects \ my_workspace

I had entered following command:
C:\Projects\my_workspace> svn checkout http://abcd.efg.com/svn/repository/my_project/trunk my_working_copy

Checkout was successful.
 
I tried updating as follows:
C:\Projects\my_working_copy> svn update

Attached is svn update output.   Why doesn't svn update work?
svn-version.PNG
svn-update-output.PNG
0
I am newly on a project to support a host of .NET Framework website, some ancient. And we need to start doing automated UI testing.

What suggestions can you make?

I want something that we will not outgrow, but that is not too difficult to get up and running.

Thanks.
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
>