Reminder: replace your Infusion fork's master!

Colin Clark colinbdclark at
Thu May 19 16:23:54 UTC 2011

Hi everyone,

A quick reminder that if you haven't already, you need to replace your Infusion fork's master branch and update all of your other branches. This is due to Justin's recent "minor surgery" to fix up the commit history after the network graph was recently flipped by an accidental fast forward.

Here are Justin's step-by-step instructions in case you haven't done this already. I followed along and it was super easy.

On 2011-05-17, at 9:08 AM, Justin Obara wrote:

> This morning I performed some minor surgery on the master branch of our project repo. This was done to unflip the network graph and restore the correct lineage of our commits.
> There are two important things I'd like to mention regarding this. First and for most, what does this mean to you, and secondly what did I do to accomplish the unflipping.
> What does this mean to you?
> ----------------------------------------
> Since I had to fix up the master branch, this means you will all have to kill your current master branch and recheck it out from the current upstream. Failure to do so will likely revert the branch back to it's erroneous state, or further confuse it, on pushing to the project repo.
> Let me know if you need any help with this. This MUST be done ASAP!!
> Steps to correct.
> 	• git fetch upstream
> 		• fetch the latest code from the upstream repo
> 	• git checkout upstream/master
> 		• checkout the local copy of the remote master
> 	• git branch -D master
> 		• delete your existing master branch
> 	• git checkout -b master
> 		• create a new master branch from the upstream/master
> 	• in your github infusion fork, click the admin button and change the default repo to any branch other than master
> 	• git push origin :master
> 		• delete your old master branch from your github repo
> 	• git push origin master:master
> 		• push your new master branch to your github repo
> 	• in your github infusion fork, click the admin button and change the default repo back to the master branch
> 	• You should probably fix up any other branch that you merged master into or branched from master since FLUID-4113 was merged on Friday evening.
> 	• you're all finished


Colin Clark
Technical Lead, Fluid Project

More information about the fluid-work mailing list