Tag: svn

Start with git or svn?

Now I make every time a zip file of all my files to make backups. But then I heard about svn und later I read that git is “better” than svn. Can someone suggest me with which I should start learning?

How many people were involved in a project? Based on Revision Control System

How do you know how many developers were involved in a project using a Revision Control System? A friend of mine found this way to look up the answer in git log: git log | grep Author: | sort -u | cut –delimiter=” ” -f2 | sort -u | wc -l Is there a straightforward […]

Found a swap file by the name “.git/.MERGE_MSG.swp”

I tried to pull origin branschName and got this strange error: error: There was a problem with the editor ‘vi’. Not committing merge; use ‘git commit’ to complete the merge. E325: ATTENTION Found a swap file by the name “.git/.MERGE_MSG.swp” owned by: eladb dated: Tue Aug 20 10:52:03 2013 file name: ~eladb/MyWorkspace/Client/.git/MERGE_MSG modified: no user […]

Choosing GIT or SVN for a very small team

My team literally consists of just myself and one or two other people. I mainly work on hobby projects and my website, and write about 1000 lines of code a week. I want to start getting into version control systems but since the majority of my projects are worked on by myself, I didn’t see […]

Is this how you normally would use SVN or GIt?

In all the tutorials I see of using SVN or Git, they always show them updating individual files. I may work on 100 files in 1 day, is it normal to work on many files and at the end of the day, just do 1 commit for all the files instead of doing each file […]

git Include a file but have its changes untracked

I’d like to include a source file (have it delivered when someone clones a repository) in my repository but have changes to it ignored by default. git update-index –assume-unchanged … doesn’t work because it only applies to the local index. I want all users to have the file in question ignored by default. .gitignore doesn’t […]

Local only, revision/version/source control

From what I’ve read: Subversion, Git, Mercurial, Bazaar are good version control software. Subversion is a server based one. But what is the best (and I encourage adding your own) system when the only requirements are: simplicity – single-user / local I want to “go back (and forward) in time” integrates well with Visual Studio […]

Unknown protocol error when using git-svn over HTTPS through a proxy server

I’ve been encountering some problems attempting to access a Subversion repository via HTTPS using git–svn. When I type git svn init –username=<my username> –trunk=https://<host>/<project>/trunk, I get the following error message: RA layer request failed: PROPFIND request failed on ‘/<project>/trunk’: PROPFIND of ‘/<project>/trunk’: SSL negotiation failed: SSL error: unknown protocol (https://<host>) at C:\Program Files (x86)\Git/libexec/git-core\git-svn line […]

Github and SVN Workflow

I’m working on a project with 2 more developers. The problem is that 1 developer is using SVN and the other developer and I using github. Is there a way to keep everything synced on both sides SVN and git?

Git Extensions usable with SVN repos?

Can Git Extensions be used without issues (or at least, with very few ones) as a SVN client? I’ve no problem using the command-line git–svn, but in some cases (picking lines/hunks to commit, for example) I’d rather use a GUI client. If there are issues, I’d like to see them along with your workarounds/solutions.

Git Baby is a git and github fan, let's start git clone.