Re: "Already up-to-date!" merge isn't a no-op?

Stephen Bash writes: > So what is the actual meaning of "Already up-to-date!"? Is it > based on the tree, the reachable commits, or something more > complicated? The resulting tree of the merge happened to be the same as the original tree (i.e. "git diff HEAD^ HEAD" is empty). This happens qui

"Already up-to-date!" merge isn't a no-op?

Hi all- I have a branch history that looks like this: --M-M-- master \ / / x feature \ \ x-A- maint In other words we had a new feature that was "so cool" that after testing on master was back-ported to maint (luckily