Tag Archives: git

git error: cannot do a partial commit during a merge.

Tweet After a pull command, I ended up with a conflict in a file, which I fixed by manually editing the file (search for the

Posted in Computer Science | Tagged | 1 Comment

How to update a forked repository (github)

Tweet I followed those steps and it worked like a charm using github interface assuming there was no changes between the fork and main repository Open your fork on GitHub. Click on Pull Requests. Click on New Pull Request. By … Continue reading

Posted in Software development, Uncategorized | Tagged , | 1 Comment

Moving from SVN to git: $Id:$ equivalent

Tweet In SVN (and CVS), you could include special strings such as

and after a commit, the revision number would appear after “Id:”, which was a convenient way to retrieve the revision for instance in a print statement. Apparently, … Continue reading

Posted in Software development, Uncategorized | Tagged | 1 Comment

migrating a SVN sub-directory to GIThub

Tweet Follow-up on a previous about migrating an entire SVN repository to github keeping the history: For a sub-directory within a SVN, you should use

without the –stdlayout option.

Posted in Computer Science | Tagged , | Leave a comment

GIT tutorial

Tweet I finally decided to use GIT for one of my new project. I know this sounds odd given that everybody nowadays seems to use it… Having used SVN for a while the transition should be smooth though. There are … Continue reading

Posted in Software development | Tagged | Leave a comment