Category Archives: Version Control

Bringing project work into the main branch $ git checkout master $ git merge projectbranchfrommaster If there are merge conflicts, you will need to resolve them and commit the changes.     x     <- merge commit     |  \     x   o <- commit on main branch … Continue reading →

I’ve been a Pivotal Tracker user for some time now and I’ve recently moved my code to GitHub, so I was interested when I found John Metta’s article which talks about automatically updating the progress of PT stories using a … Continue reading →

I’ve come to prefer working with git to working with SVN, so I set about converting one of my small projects. GitHub says ‘We highly recommend using the svn2git tool to convert an SVN repo to a git repo. …For … Continue reading →

I was not amused this afternoon when my attempt to push to GitHub for the first time from a new (well, old) machine was met with the message Failed to erase credential: Element not found fatal: Authentication failed A quick … Continue reading →

I want to rename a branch $ git branch -m <currentname> <newname> Source: dmo.ca blog I’ve forgotten which branch my branch was created from $ git log -g <branchname> or $ git reflog show <branchname> and look for the first … Continue reading →