Question

I am working with my colleagues with GIT as the source code repository.
Assume that he works on branch chris, I work on branch mike.
At some time, he merged PART OF the content from my branch mike to his branch chris.
I didn’t do any changes on my branch mike anymore.
Later he did some more development.

Now, I’d like to keep my branch latest content (as chris). In other words, I’d like to overwrite all the content in mike with the content from chris.

How can I do the achieve this?

Thanks,
Mike

Answer 1

If I understand you correctly, then you should be able to do a fast-forward merge from chris to mike. For example:

git fetch --all
git checkout mike
git merge origin/chris

On the other hand, if you want to delete your “mike” branch and replace it with a copy of “chris,” then you can do this:

git fetch --all
git checkout master
git branch -D mike
git checkout -b mike origin/chris

Make sure you have a solid backup before doing this sort of surgery on your repository, though. It’s easier to restore a tarball or backup than to unwind a complex merge.