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

Hi,
I have performed mvn release:prepare release:perform.
And a tag got created. I am using git and phabricator
Now i had to make some minor changes to the code. But dont want to create another tag unnecessarily.
So can i make the earlier tag point to the new code ?
The tag is important because that is how the build system in our office works...
But each time i make some change for deployment i dont want to create a new tag. and somehow make the older tag point to new code

Please suggest how to do it. and any alternatives ?

Thanks
0
Learn SQL Server Core 2016
LVL 13
Learn SQL Server Core 2016

This course will introduce you to SQL Server Core 2016, as well as teach you about SSMS, data tools, installation, server configuration, using Management Studio, and writing and executing queries.

Hi,
I have noticed sometimes whenever i do a git pull.
The editor will open up for merging with the default message :
Merge branch 'branch-name' of 10.1.5.12:app-portal into 'branch_name'
And i unnecessarily end up creating a new commit.

I dont know why this is happening ?
Ideally when i do a git pull it should just pull out the changes and not merge something...
Moreover why this message is appearing in the commit ?

Thanks
0
I have a scheduled task that runs a batch file.  The batch file has several lines where I do a "git pull" command from a specific Git repository.  The Windows server where this runs has already been configured with proxy settings so that when you run "git pull" or any "git" command, it will properly connect to the required repository and run the command.  I have figured out that this schedule task and batch file will run just fine when a user is logged on.  But if I log out of the server, the schedule task start, but the "git pull" command gets stuck.  It's almost like it's can't connect and then the rest of the batch file will not run.  What should I do to ensure the "git" commands run fine even when a user is not logged in?

Thanks in advance!
-Christian
0
how does Auto Merge in Team Foundation Server work? There must be an algorithm to auto merging in for Code management.
0
I'm using ubuntu 18.04 with a SVN project and when i modify any file in the folder appear a folder "C:\Program Files\CollabNet\Subversion Client" with a lot of files in the current path, if i tried to delete it it apear again.  i'm using Intellij to edit the project but this happen too if i use the file manager. This happen in windows too.

how can i fix this and why is this happening?
0
Hi,

 I've never install,configure and test Gitlab runner on Cloud VM (redhat 7.5 ) for version control of my Python Script.

Anyone help guide me through.

Thanks
0
Hi,

Ps advice how to syn with my local-repo to the gitlab repo with error. Tks.

giblab_error1.jpg
Keep loading non-stop
giblab_error2.jpg
0
Having bought a new machine (running Windows 10 professional) I Have installed the following:

MS Visual Studio 2017 community
MS SQLServer express 2017
Team Foundation Server express 2015

I find that I do the have the option in VS to "Connect to Team Foundation Server"


I have "Visual Studio Team Foundation Server" set as the Source-Control Plug-in.

I can see my server in Source Control Explorer but cannot add folders or items.

If I go into Team Explorer I can see GIT repos   (dunno how to use these) and I can sometimes add a solution to Source control whereby it is visible in Source Control Explorer temporarily.

How can I connect to TFS correctly in VS 2017 Community please?
0
Hello, I'm using GitLab (git), and I want to be able to create a single tag that captures all of the commits for that branch in the past week.
For example, let's say I have 5 different commits to the master branch. I want to create a consolidated tag of all of those commits.

How do I do this? I'm using command line language.

Thanks
Jeff
0
We have two concepts in GIT Rebase and Merge

Rebase Overrides the history of commits

Merge keep track of history of commit.

Merge would be cluttered if many people works and commits on the same feature branch.

Rebase would be time consuming when multiple people commits on the same branch eventhough we just changed a few lines in the same committed file.

When to use Rebase and when to use merge in real time is not clear?

Please advise.
0
Microsoft Azure 2017
LVL 13
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.

I have a form I built in Sharepoint 2010 tied to a List.  I have version control turned on and for one key field I utilize the Append function to track history.  This is great, however when I export I am aware of a known limitation that only the last update is exported.  My challenge is that I have users that update this key field and then come back and make a change to the form (not including the key field).  This results in blank data when exported.  

Question: Is there a way to include detail from the last 2 versions when exporting to excel?
0
My current problem is that I'm trying to push new files to our project's dev server and each time I make a commit with SVN, this error is popping up: " error MSB3541: Files has invalid value "<<<<<<< .mine". Illegal characters in path. ".

I did a little bit of research and found that this is a warning that SVN gives when it tries to merge two disparate files. The ".mine" is added to the data of the file along with a ".yours" section to show the changes and allow the user to manually edit out the conflicts on the file.

However, whenever I try to edit the .dll file in question TortoiseSVN gives me an error message saying that this type of file can not be edited. I've tried recompiling the project's dll's, deleting the obj and bin folders to force the project to rebuild the offending directory, used old .dll files from an earlier version, recompiled the dll's on the other computer that has access to this repository, unloading and reloading the project that contains the dll file in question, and building the entire project. So far nothing has returned a solution. Each time I push the newly built files the same error pops up.


Is there a way to edit out a conflict of this nature on a .dll file or am I missing something very obvious?
0
Hello

Let's say i narrow the language in github search. I further want to specify a string to search for in all the repos available. Possible? How?

thanks
0
can we  run a script automatically when a developer commits a change into GIT
best way to run this script. kindly help.
0
I want to know how to edit a comment in git after commit has been pushed , the exact commit number is available with me, I am using "ubuntu 16.04"   and git version is "GitLab Community Edition 8.14.0"
There are few more users who have done a commit after me on the same project.
I do not want other commit messages to be altered.
0
How can we start email notification in VisualSVN server?
0
Hi

if you checked out a folder using svn, call it A. Then you made some modifications to A.

You also checked out the same folder, call this copy B. You made some modifications to B, then checked it in , so that it becomes the latest revision and the working copy.

How can you merge the changes you have in A with what is the latest revision? Notice how the changes in A have never been checked in and are no longer the latest working copy or revision either (because of B)?

i tried
svn merge /path/to/A /path/to/B
Also
svn merge --reinitegrate /path/to/A /path/to/B

thanks
0
Hi Experts,

I've only just started using GitHub - via the latest version of Github Desktop (Windows GUI).

I created a repository via the web interface - and added files to it via the web interface.

Now I'm trying to Sync using the Sync button in Github Desktop.

This gives this error:  GitHub Error: "Failed To Sync This Branch. you might need to open a shell and debug the state of this repo.

I've opened the Github shell and typed git status.

Here's the output:

D:\GitHub test [master ? +1 ~0 -0 !]> git status
On branch master
Your branch is behind 'origin/master' by 1 commit, and can be fast-forwarded.
  (use "git pull" to update your local branch)
Untracked files:
  (use "git add <file>..." to include in what will be committed)

        APSDS50/

nothing added to commit but untracked files present (use "git add" to track)
D:\GitHub test [master ? +1 ~0 -0 !]>

Open in new window


That's all goobledegook to me.

I was hoping to fix this by Github Desktop commands - I really don't want to use the Shell if I can avoid it.

Regards,
Leigh
0
Hello All,

Can any one tell me how to call jenkin parameter value into the groovy script

I'm creating a jenkins job that give permission to a another job to a particular User.

below pic shows the parameter. i want to call this parameter value into the groovy script

zdSYE.png
Find the script below.


        import hudson.model.AbstractProject
        import hudson.model.Item
        import hudson.security.AuthorizationMatrixProperty
        import hudson.security.Permission

        AbstractProject proj = hudson.model.Hudson.instance.getItem("testjob")
        AuthorizationMatrixProperty authProperty = proj.getProperty(AuthorizationMatrixProperty.class)
        Set<String> users = new HashSet<>();
        users.add('userid')
        Map<Permission,Set<String>> newPermissions = new HashMap<Permission, Set<String>>()
        newPermissions.put(Item.READ, users)

        proj.addProperty(new AuthorizationMatrixProperty(newPermissions))
        proj.save()



That parameter value should have to come here [ ->('userid')<-here in the groovy script]

can any one tell me how to call jenkin parameter value into the groovy script

Thanks in advance
0
Introduction to R
LVL 13
Introduction to R

R is considered the predominant language for data scientist and statisticians. Learn how to use R for your own data science projects.

I have a jenkins installation which works fine before I cloned a second instance. I wanted to make a second instance so that I can test upgrade. I successfully made the second instance and upgraded it. However, after upgraded the second instance, my first instance doesn't work properly, I cannot use service command to stop or start the instance. Also, it keeps asking for the passphrase.

Anyone can help me with it?

thanks.

root@monitor:/usr/lib/jenkins_jasontest$ service jenkins stop
Shutting down Jenkins                                      [  OK  ]
root@monitor:/usr/lib/jenkins_jasontest$ service jenkins start
Starting Jenkins                                           [  OK  ]
root@monitor:/usr/lib/jenkins_jasontest$ ps -ef | grep jenkins
root     16586 26783  0 22:20 pts/0    00:00:00 grep jenkins
root@monitor:/usr/lib/jenkins_jasontest$ /etc/alternatives/java -Dcom.sun.akuma.Daemon=daemonized -Djava.awt.headless=true -Duser.timezone=America/Los_Angeles -DJENKINS_HOME=/var/lib/jenkins -jar /usr/lib/jenkins/jenkins.war --logfile=/var/log/jenkins/jenkins.log --webroot=/var/cache/jenkins/war --daemon --httpPort=8080 --ajp13Port=8009 --debug=5 --handlerCountMax=100 --handlerCountMaxIdle=20
Enter passphrase for key '/tmp/ssh373296399860644886key': Enter passphrase for key '/tmp/ssh6335524674191295479key':
Enter passphrase for key '/tmp/ssh6598053261465521274key':
Enter passphrase for key '/tmp/ssh7898039575812345853key':
Enter passphrase for key …
0
I have MyBatis 3.3.1, Spring 4.2.5 and Hibernate 5.0.6.Final.
In application-context.xml :
<bean id="jtaTxManager" class="org.springframework.transaction.jta.JtaTransactionManager">
...
</bean>
<tx:annotation-driven transaction-manager="jtaTxManager" proxy-target-class="false"/>
 <bean id="sessionFactory" class="org.mybatis.spring.SqlSessionFactoryBean">
        <property name="configLocation" value="classpath:/META-INF/myBatis-config.xml" />  
        <property name="dataSource" ref="dataSource" />
    </bean>

    <bean id="mySessionTemplate" class="org.mybatis.spring.SqlSessionTemplate" autowire="no">
        <constructor-arg index="0" ref="sessionFactory" />
    </bean>
<bean id="myDao" abstract="true" class="...GenericDaoJdbc">
        <property name="sqlSessionTemplate" ref="mySessionTemplate"/>
    </bean>

All this is working fine. Entities specifiefd in myBatis-config.xml annotated with @Entity & @Table (from hibernate 5.0.6)
I tried to implement Hibernate Envers :

<bean id="enversSessionFactory" class="org.springframework.orm.hibernate4.LocalSessionFactoryBean">        
        <property name="dataSource" ref="dataSource/>
        <property name="jtaTransactionManager" ref="jtaTxManager"/>
        <property name="hibernateProperties">
            <props>
                <prop key="hibernate.dialect">org.hibernate.dialect.MySQL5Dialect</prop>
                <prop key="hibernate.show_sql">true</prop>
                <prop …
0
I have a website that I need to commit system generated files and folders to an existing git repository via linux command line. I've pulled the repo to my server, and am writing files within a sub folder of the repo, but when I run 'git add [FOLDER]/*' , its giving me an error that the folder is outside the repository. I'm at a loss as to how to get past this. I'm brand new to git, please help!
0
This is Chef cookbook question.

Question: I need to dynamically reference an index.html file located on github.com within the recipe.

Apache2:

template '/var/www/html/index.html' do
   source index.html.erb
end

In the above code, /var/www/html/index.html file is being replaced with index.html.erb located in <cookbook>/template/default/index.html.erb file. What I want is instead of index.html.erb, I need to use https://github.com/<repository>/myIndex.html

If there is any change in myIndex.html, it should reflect in /var/www/html/index.html realtime.

I appreciate your help.
0
Hi Expert,

I just got installed Git on my server  running on CentOS 6.7. However, I can't access to my repository via public key, actually my laptop can access my server using ssh key which I already added to server, I would like to know is there any configuration I should take on my linux server in order to get access to my repository?

Thanks
0
I am using VSS 6

I  am working on 4 files.

I have to modify these  4 files for bug fix1

again..

I have to modify  these same 4 files for bug fix2

Now , how do I  version  these files so that I could  find code with fix1 only and  code with fix2 only separately  at a later time ?

( N.B:   I am asking this because, sometimes user ask  to deploy code to production  with fix2 only excluding fix1 work or vice versa)
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
>