If you have accidentally committed the wrong files into Git, but haven’t yet pushed it to the server, you can recover, or undo your commit… Read More »How to Undo the most recent local commits in Git
Git submodules are a way of including another repository’s code into an existing codebase, without associating it’s code or tracking history in the parent repository.… Read More »How to add a Git Submodule to an existing codebase
So you just tried to do a git pull and got the following error: error: The following untracked working tree files would be overwritten by… Read More »Solution: error – The following untracked working tree files would be overwritten by merge
You have received the dreaded fatal: refusing to merge unrelated histories error! Why does this happen? Git is all about Deltas (the difference between 2… Read More »Fatal: refusing to merge unrelated histories
There comes a time when you need to split out a subdirectory into it’s own git repo. This is a very simple task if you… Read More »How to Split a Subdirectory to a New Git Repository and Keep the History
You can ignore certain files and folders from being committed to Git by means of including a .gitignore file. Unfortunately, you may have forgotten to… Read More »How to make Git “forget” about a file that was tracked but is now in .gitignore?
If you have ever been in the annoying situation where you had to run git clone from a server that you did not have interactive… Read More »Non-interactive git clone (ssh fingerprint prompt)
Git Pull vs Fetch Many of us take a look at git fetch and git pull and believe them to do the exact same thing!… Read More »The difference between ‘git fetch’ and ‘git pull’
Sometimes you need to pull a remote branch and want to accept all their commits (and history) and override your own repository. It’s quite simple… Read More »Can’t pull a Git branch because of merge conflicts?