Re: [Condor-devel] GIT branch surgery

[Nathan Panike <nwp@xxxxxxxxxxx>]

On Mon, Aug 22, 2011 at 02:36:45PM -0500, Greg Thain wrote:
> 
> There was a problem where the master was merged into the V7.7.1
> branch.  With Nathan's good help the branch is now fixed, but anyone
> with the branch checked out will need to remove and re-fetch it.
> 
Some items on this:

1. Faster way to do the above, if you are not on V7_7_1-branch:
git branch -f V7_7_1-branch origin/V7_7_1-branch

Or, if you are on V7_7_1-branch, do
git reset origin/V7_7_1-branch
(to avoid destroying your working tree)

2. The offending commit was 38b5feb, Dan Bradley, "Merge branch 'V7_6-branch'
into V7_7_1-branch". It appears from the history that Dan did something akin to
'git merge origin/master' while on V7_7_1-branch.  So the moral of the story is
that you should only do 'git merge origin/master' if you are on the master
branch.

3. I will delete the tags BUILD-V7_7_1-branch-2011-8-{18,19,20,21}, as they are
no longer part of 7.7.1 history and will be a source of confusion to anybody
spelunking through history in the future.

They should also be deleted in your repository: you must do this yourself and
you should run the command

git tag -d BUILD-V7_7_1-branch-2011-8-{18,19,20,21}

Nathan Panike