Git merge reports “Already up-to-date” though there is a difference

The message “Already up-to-date” means that all the changes from the branch you’re trying to merge have already been merged to the branch you’re currently on. More specifically it means that the branch you’re trying to merge is a parent of your current branch. Congratulations, that’s the easiest merge you’ll ever do. 🙂

Use gitk to take a look at your repository. The label for the “test” branch should be somewhere below your “master” branch label.

Your branch is up-to-date with respect to its parent. According to merge there are no new changes in the parent since the last merge. That does not mean the branches are the same, because you can have plenty of changes in your working branch and it sounds like you do.

Edit 10/12/2019:

Per Charles Drake in the comment to this answer, one solution to remediate the problem is:

git checkout master
git reset --hard test

This brings it back to the ‘test’ level.

Then do:

git push --force origin master

in order to force changes back to the central repo.

Related Posts:

  1. How to merge branch to master?
  2. The following untracked working tree files would be overwritten by merge, but I don’t care
  3. The following untracked working tree files would be overwritten by merge, but I don’t care
  4. merge one local branch into another local branch
  5. What is the difference between `git merge` and `git merge –no-ff`?
  6. The following untracked working tree files would be overwritten by merge, but I don’t care
  7. Updates were rejected because the remote contains work that you do not have locally
  8. How to resolve git status “Unmerged paths:”?
  9. How do you merge two Git repositories?
  10. How to merge a specific commit in Git
  11. Eclipse EGit Checkout conflict with files: – EGit doesn’t want to continue
  12. How do I rename a local Git branch?
  13. How do I undo the most recent local commits in Git?
  14. Undo a Git merge that hasn’t been pushed yet
  15. fatal: Not a git repository (or any of the parent directories): .git [duplicate]
  16. Git refusing to merge unrelated histories on rebase
  17. What is the difference between git push origin and git push origin master
  18. Git pushing to remote branch
  19. git – remote add origin vs remote set-url origin
  20. How do I undo ‘git add’ before commit?
  21. Git: Message ‘src refspec master does not match any’ when pushing commits in Git
  22. How can I see the differences between two branches?
  23. How to upgrade Git on Windows to the latest version
  24. Need to reset git branch to origin version
  25. How do I push a new local branch to a remote Git repository and track it too?
  26. git: fatal: Could not read from remote repository
  27. Windows git “warning: LF will be replaced by CRLF”, is that warning tail backward?
  28. How to change the URI (URL) for a remote Git repository?
  29. What would I use git-worktree for?
  30. Git error when trying to push — pre-receive hook declined
  31. Why does git say “Pull is not possible because you have unmerged files”?
  32. Pushing empty commits to remote
  33. How do I revert all local changes in Git managed project to previous state?
  34. How do I ignore an error on ‘git pull’ about my local changes would be overwritten by merge?
  35. How to revert multiple git commits?
  36. Stash only one file out of multiple files that have changed with Git?
  37. What is git fast-forwarding? [duplicate]
  38. fatal: The current branch master has no upstream branch
  39. You have not concluded your merge (MERGE_HEAD exists)
  40. How to cherry-pick multiple commits
  41. Reset local repository branch to be just like remote repository HEAD
  42. git – pulling from specific branch
  43. What is “origin” in Git?
  44. How to copy commits from one branch to another?
  45. Trying to git pull with error: cannot open .git/FETCH_HEAD: Permission denied
  46. Remove a git commit which has not been pushed
  47. There is no tracking information for the current branch
  48. How can I make Git “forget” about a file that was tracked, but is now in .gitignore?
  49. Git push results in “Authentication Failed”
  50. What are the differences between .gitignore and .gitkeep?
  51. How to remove files from git staging area?
  52. How do I ignore an error on ‘git pull’ about my local changes would be overwritten by merge?
  53. How to undo git reset –soft to get my changes back?
  54. .gitignore and “The following untracked working tree files would be overwritten by checkout”
  55. What’s the difference between git switch and git checkout
  56. git – Your branch is ahead of ‘origin/master’ by 1 commit
  57. What is the point of ‘git submodule init’?
  58. Git: How to update/checkout a single file from remote origin master?
  59. Git nothing added to commit but untracked files present – even with those files added to gitignore
  60. How can I remove a commit on GitHub?
  61. What is the difference between ‘git remote update’, ‘git fetch’ and ‘git pull’?
  62. GitLab remote: HTTP Basic: Access denied and fatal Authentication
  63. git: How to ignore all present untracked files?
  64. Move existing, uncommitted work to a new branch in Git
  65. What are the differences between “git commit” and “git push”?
  66. Your branch is ahead of ‘origin/master’ by 3 commits
  67. What to gitignore from the .idea folder?git intellij-idea gitignore webstorm
  68. Why I always Got Error “Push to origin/master was rejected”?
  69. Github Windows ‘Failed to sync this branch’
  70. How do you clone a Git repository into a specific folder?
  71. How can I generate a Git patch for a specific commit?
  72. How can I unstage my files again after making a local commit?
  73. Delete forked repo from GitHub
  74. Push local Git repo to new remote including all branches and tags
  75. How can I see the changes in a Git commit?
  76. Git merge without auto commit
  77. How to get Git to clone into current directory
  78. Git removing upstream from local repository
  79. Git pull – Please move or remove them before you can merge
  80. Unlink of file Failed. Should I try again?
  81. How to get Git to clone into current directory
  82. git-diff to ignore ^M
  83. Change the location of the ~ directory in a Windows install of Git Bash
  84. Differences between Commit, Commit and Push, Commit and Sync
  85. How can I delete all Git branches which have been merged?
  86. git replace local version with remote version
  87. difference between git merge origin/master and git pull
  88. Git checkout – switching back to HEAD
  89. How to create a new branch from a tag?
  90. How to modify a specified commit?
  91. How can I push a specific commit to a remote, and not previous commits?
  92. Git ignore local file changes
  93. What’s a good (free) visual merge tool for Git? (on windows)
  94. Import existing source code to GitHub
  95. git checkout all the files
  96. Git Workflow for Large, Live Site?
  97. Workflow for working with git and WordPress
  98. Git beginner: Keeping track of on-server changes
  99. best practice on pushing staging development (database/uploads) to the live server
  100. how can I create a WP offline environment before releasing the websites? [closed]

Leave a Comment