Tag: version control

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 […]

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 […]

Source Tree and Github not seeing all of my files

I tried creating a repository of all the files I am using in this project. And for some reason when I added files to my local directory, only some of them were picked up by SourceTree and commited and pushed to Github. Here is what the local directory looks like (Each folder contains files): The […]

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 […]

Is there a way to get the affected files of a commit with a git post-commit hook?

I’m using git within a perforce repository. I want to be able to know exactly what files were affected by a git commit so I can turn around with a post-commit hook and open those files for edit in perforce, so the perforce server knows about the changes. Is there a way I can get […]

Way to see the whole commit history of a repo in Egit/TortoiseGit?

I’m looking for a way to see, though egit, to the whole history of my current git repo. From what it looks like, egit’s “Show in History” will only show commits up to the current commit. With this I mean that if I do commit1 and commit2 and then decide to do checkout of the […]

Are there any good, cross platform, Mac, Win32, *nix, Git GUI clients?

It should also support SSH2 and public key auth for starters. secondly on Mac/Windows it should have a decent installer.

Is creating and removing lots of branches in git bad?

I have a main branch master that contains the stable code. Each time I want to build something new I get checkout -b ‘development’, add the new code, then merge it back into the master and delete the development branch. However, is this creating a larger repo database than just keeping the development branch and […]

Revision control system with multiple similar projects (one customized for each customer of a same product)

I have multiple SW projects from different customers with which I am implementing git version control system and I would like to know what is the best way to do it. The projects are similar and most often derived from existing ones but unique for each customer. Would I create a repo for each customer […]

Why do merge conflicts happen?

For example: I have a master branch. I create a file file.txt and I write Master branch in it, and then I commit it. I create another branch called fix20, and modify the text of file.txt to This is fix20 branch. Then I commit it. I switch to the master branch and then I create […]

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