Along these lines, we are in a somewhat similar situation. Basically,
we have had a major feature branch for a GSoC project, and this branch
has now substantially diverged from master. However, the divergence
is almost completely due to equivalent work that was done first in
master, and then re-done "by hand" in the feature branch because it
was too hard to merge (we are git noobs). So, we want to make master
point to the new branch, and rename master to something like
old_master for safekeeping. So it looks like we should first create a
branch (or tag) to save the tip of master, and then hard reset master
to the tip of the feature branch.
You received this message because you are subscribed to the Google Groups "Git
for human beings" group.
To post to this group, send email to git-us...@googlegroups.com.
To unsubscribe from this group, send email to
For more options, visit this group at