Git rebase fails, ‘Your local changes to the following files would be overwritten by merge’. No local changes?

by

This is the same answer as another one of my questions re git troubles.

I’m on a mac, and this obscure config change seemed to fix all my woes regarding unstaged changes when there were none.

git config --global core.trustctime false

I think it’s to do with differences between windows file times, linux file times and mac file times. who knows, feel free to comment if you do.

Update: This blog post explains what’s going on, sort of.

More Related Contents:

  1. Delete commits from a branch in Git
  2. Undoing a git rebase
  3. When do you use Git rebase instead of Git merge?
  4. What exactly does git’s “rebase –preserve-merges” do (and why?)
  5. Git workflow and rebase vs merge questions
  6. How to cherry-pick multiple commits
  7. Edit the root commit in Git?
  8. What’s the difference between ‘git merge’ and ‘git rebase’?
  9. Combine the first two commits of a Git repository?
  10. How to remove/delete a large file from commit history in the Git repository?
  11. Remove folder and its contents from git/GitHub’s history
  12. How do I run git rebase –interactive in non-interactive manner?
  13. git rebase without changing commit timestamps
  14. How do I recover/resynchronise after someone pushes a rebase or a reset to a published branch?
  15. How to rebase many branches (with the same base commit) at once?
  16. How do I delete a commit from a branch?
  17. What are the practical consequences of rewriting Git history?
  18. How to rebase local branch onto remote master
  19. git remove merge commit from history
  20. git rebase basics
  21. Choose Git merge strategy for specific files (“ours”, “mine”, “theirs”)
  22. Change old commit message using `git rebase`
  23. What is the difference between git pull and git fetch + git rebase?
  24. Rebase feature branch onto another feature branch
  25. Your branch is ahead of ‘origin/master’ by 3 commits
  26. Remove commit for good
  27. How to know if there is a git rebase in progress?
  28. How to retain commit gpg-signature after interactive rebase squashing?
  29. Git rebase –preserve-merges fails
  30. Can tags be automatically moved after a git filter-branch and rebase?

Leave a Comment