GIT - 我可以将分支合并到特定的提交

Question

I currently have a UAT branch and a master branch. I merge the UAT branch into Master on a weekly basis (after a weekly release).

I have foolishly checked in another item onto UAT before doing the merge.

Can I do something like this:

git merge uat 4d9ed3b8122a215f64f07028c92bb0cb0a8b4570

So would that merge UAT up to that commit?

Answer 1

A git branch is merely a pointer to a commit. Therefore, you can definitely ignore the fact that the commit you want is somewhere behind the uat branch, and just do this (from master):

git merge 4d9ed3b8122a215f64f07028c92bb0cb0a8b4570

This will create a merge commit between the current tip of master (which is just another pretty name for a long commit hash), and 4d9ed3b8122a215f64f07028c92bb0cb0a8b4570 .