Before Git pull In the default repository Git pull already performed and you’re in a conflicted state Source: https://stackoverflow.com/questions/10697463/resolve-git-merge-conflicts-in-favor-of-their-changes-during-a-pull
When you have two unrelated projects (two different repositories), and you try to pull and merge files, The “fatal: refusing to merge unrelated histories” Git error occurs. Solution: use –allow-unrelated-histories Sources: https://www.educative.io/edpresso/the-fatal-refusing-to-merge-unrelated-histories-git-error https://stackoverflow.com/questions/37937984/git-refusing-to-merge-unrelated-histories-on-rebase
In this example a CodeIgniter app, where the database config file was hard-coded and needed to be ignored from the future commits. The simplest way to deal with that is : git update-index –assume-unchanged method. Command line: Confirm it worked Restore git staging
This problem is due to a submodule, pointing to an unreachable remote location. Changed directory to the offending dir: Remove the .git directory inside it: Update the git cache: Go to the parent directory: Add the directory to git: