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.

I am new to this, but followed a guidelines for contributing open source .

steps -

1. Fork the project on Github.
2. clone it in my local machine
3. configured git locally, such that origin points to my fork  and upstream points to original repo.

Now I'm ready to create a branch from my fork/origin and start working on it.

If  at any point my local branch falls behind on commits to the original repo, as there are lot of contributors to the project.

How do I keep my local branch updated?

I would have to update the fork/origin first, then pull those changes to my local machine and
merge the master to my branch locally?

is that the general idea? I am new to git commands so if anyone can provide the steps and commands that would be great.

also, if there at any point there are merge conflicts , how is that resolved?
0
What simple (free / opensource) solution is there to have a Version Control system for a Excel document or Access database?
0
Hi Experts,

Git branch

i have added changes in one called -->Test.java
i have commited the file locally but not pushed to branch.
i have deleted same from my local-but not commited after deleting the file-so file is available in repository.

Now i am looking for a delted file which is having local commit.
tortoise-git-show log
i am able to see my local file

1.can some one suggest how to get that file (deleted file which is having local commit)

2.if i want to get header version file ( i mean before local commit changes) how to get it.
0
Hello,

I faced a problem on git that the repository  will be removed without any notification
I am wondering why note that this repository has been create since 2 weeks

we are using below commands:
git add .
git commit
git push

your quick answer is highly appreciated.
Best,
0
I setup a custom "document type" retention policy in SharePoint 2013 on a document library that has version control enabled. The retention policy triggers a workflow that emails users documents that have expired. Screenshot below:

retention-policy.PNG
The problem I am having is if the end user changes the expired date to a future date, the retention policy uses the old expiration date instead of the new one so an email is sent even though the item has not expired.  I figure its because version control is enabled, its using the old date but I don't want to turn off version control.  Any other fixes for this?  thanks and much appreciated.
0
hi
i have a branch preprod and another branch kotak.
i merges kotak into preprod.
but i found a file nsdl.java not there in preprod.

but its there in kotak.
all other files seem to be getting merged.
but this files is not even present in preprod.

what could be the reason for that ?

also now that this is an issue. and i want all the changes
of kotak into preprod. is there something like hard merge or something which can resolve this issue ?

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

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
>