Category: Version Control
-
Heroku setup: “git push heroku master” permission denied ssh issue
I think i am not the only one that ran into this issue trying to set up your app into Heroku. I was trying to do so as part of following the Ruby On Rails tutorial and ran into this issue in which i sank a couple of hours. I am running on Ubuntu 11.10,…
-
Git Merge/Git Difftool: Compare a file between two different branches
Moving from Subversion to Git can be hard and i ran into an issue trying to resolve conflicts in a file that was different in the two branches I work on. Since I am working on a Mac, with OSX Lion, i found these two articles to be quite useful: How to setup Git to…