[Solved] Fatal: refusing to merge unrelated histories in Git
You have received the dreaded fatal: refusing to merge unrelated histories error!
You might find yourself asking one of the following questions:
- What …
Git
21 articles about git development, tools, and best practices
How to Split a Subdirectory to a New Git Repository and Keep the History
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 don’t care about …
Read Article →How to add SSH keys to GitHub
When working with GitHub, you will need to identify yourself. The default way is using your username and password. However, you can also create an SSH …
Read Article →How to make Git “forget” about a file that was tracked but is now in .gitignore?
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 Article →How to Git Reset a Single File
It’s very easy to reset files that have not yet been committed to git.
Reset a single file
git reset <filename>
You can also specify the …
Read Article →Non-interactive git clone (ssh fingerprint prompt)
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 access to, such as a …
The difference between ‘git fetch’ and ‘git pull’
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! This is just not true.
So what exactly …
Read Article →Can’t pull a Git branch because of merge conflicts?
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 …
Read Article →How to delete/revert a Git commit
You’ve just pushed something to a Git repository and you immediately regret it!
Run git log to see what the commit id was:
git log
Take the …
Read Article →