* development

mylocal-branch

origin/development

>git status

# On branch development
nothing to commit (working directory clean)
>git merge mylocal-branch (you want to merge from mylocal-branch to development branch )

> git push <repository | origin> development

Works if the remote branch ‘development’ has no simultaneous commits from a co-worker, say.

But fails with the following messages if there were simultaneous commits on the remote branch ‘development’

! [rejected]        development -> development (non-fast forward)
error: failed to push some refs to ‘<your repository name>’

Here is how to fix this scenario,

> git pull <repository | origin> +development:development

The ‘+’ option fast forwards the local ‘development’ branch to the remote ‘development’ branch

> git merge mylocal-branch

At this point you have changes from the remote and local ‘development’ branches merged

> git push <repository | origin> development

The changes were now pushed to the repository without being rejected. This is one scenario where you can use fast forward to merge changes and bring local and remote branches upto date.

Apparently, it is also cross platform compatible.

For a long time I was using print statements to throw debug output and had a hard time reading the blob of text output that was getting spit out.

Now my log output and debug output are much more readable

 var uri_re = /^(?:(?:[^:\/?#]+):)?(?:\/\/(?:[^\/?#]*))?([^?#]*)(?:\?([^#]*))?(?:#(.*))?/;

This ad on the business section of the paper caught my eye,

“Great Minds Gathering on Oct 7 - Don’t miss it. Today’s date Oct 23 2008.”

Quite entertaining

With all the doom and gloom, market crashes and poor earnings reports, this is the only thing on the business page that brought a smile.

MPLS ALT .NET

Yesterday was the first ever MPLS ALT.NET get together at the Bulldog N.E Thanks Ira Mitchell and Jim Swanson for hosting. Judging by the turnout at the initial meet one can easily tell that there is a great enthusiasm for alt .net in Minneapolis.

Jim and Ira do a better job of explaining What ALT .NET is all about.

The folks at Redmond, WA do a great job trying to build awesome tools for developers but often times committing resources to every available tool in the open source community is not possible. Filling this gap is where a community like ALT .NET can help.

The state of Microsoft and the OSS community is better explained by Ayende Rahien.

I hope that this community becomes successful and brings in the best of the OSS, Java and RoR communities into the .NET world.

Here is how I configured Fiddler to debug web applications hosted in your local machine,

Lets say your application is accessed using the URL http://localhost:8090/MySpiffyApp/default.aspx. To make fiddler capture the HTTP requests sent to this URL, all you have to do is edit the HKCU\Software\Microsoft\Fiddler\ReverseProxyForPort and set the decimal value to 8090. This tells fiddler to proxy all traffic sent to HTTP port 8888 (default proxy port) to HTTP port 8090. Now access the application using the fiddler proxy port

http://localhost:8888/MySpiffyApp/default.aspx

and you should be able to see the packet trace in Fiddler.

If you see the page below instead of your application then try restarting Fiddler and make sure the registry key name matches exactly as above.

GET / HTTP/1.1
Host: localhost:8888
User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.2; en-US; rv:1.8.1.3) Gecko/20070309 Firefox/2.0.0.3
Accept: text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5
Accept-Language: en-us,en;q=0.5
Accept-Encoding: gzip,deflate
Accept-Charset: ISO-8859-1,utf-8;q=0.7,*;q=0.7
Keep-Alive: 300
Connection: keep-alive
Cookie: ASPSESSIONIDAADBDSRQ=NJJLKNGCKNJMNIIFAIDFCEIB
Cache-Control: max-age=0

Let me know if this didn’t work for you or if you have another way of debugging web applications hosted on your local machine.

I received a few encouraging words mostly in jest about how I should be involved with something revolutionary like the LHC project and drew a few sarcastic comments too.

The email responses from my friends inspired me to write this post and made me understand the significance of the LHC project a little better and also made me realize how we may be overlooking great revolutions happening around us.

Here is my email response,

Dear XYZ,

Thanks for the encouraging words and I enjoyed the sarcasm too…

Revolutions don’t happen overnight… rather they reach a crescendo at the right moment or they erupt from their simmering state into an eruption almost overnight. The trouble with revolutions, too is that you don’t know when they are happening.

The point of sharing that video was to show, how serious research can be presented in a light manner.

And personally, it had a context to me since I recently read this article, Surfer dude rewrites Physics ?that made references to the Large Hadron Collider.
If you do not have the time to read the whole article , here is a snippet that references the Large Hadron Collider,

“…The ultimate proof, or disproof, could then come when the world’s most powerful particle accelerator, the Large Hadron Collider, begins operating later this year in Switzerland. It is widely anticipated that the LHC will lead to the discovery of new subatomic particles, and string theorists are also betting on it to validate some of their ideas…”

In short, the assumptions we are making about how we are held together in one piece can be shattered by this collider.

This my friend is an example of a revolution in progress since it can explain among other truths the beginning(s) and the end of time…

-Senthil

For example here are some obvious Smart people traps and yet they need to be overstated.

I particularly liked the following observations,

..in order to change the world through politics, you must gain power, and the game of gaining power will fuck you up for sure.”

“…They leave school thinking that the way to be useful and show your smarts is to point out why things won’t work, rather than using some of those smart to find a way forward.”

Can you think of more smart people traps like these?

>sudo apt-get install git-core

was successful but gitweb was not,

>sudo apt-get install gitweb
Reading package lists… Done
Building dependency tree
Reading state information… Done
Package gitweb is not available, but is referred to by another package.
This may mean that the package is missing, has been obsoleted, or
is only available from another source
E: Package gitweb has no installation candidate

If you get this error message,

Try sudo apt-get update

and then run

sudo apt-get install gitweb

This installed gitweb successfully.

Highlights from the original article

* Build a personal profile:

While it was difficult to get the attention of the mainstream media, Hamilton did find a receptive audience writing for community and neighborhood papers, and speaking to local women’s groups.

* Take advantage of technology:

Linking up with like-minded sites and including lots of references to other electronic sources — especially to lesser known causes such as Ovarian Cancer Canada — has really helped, Hamilton says.

* Seek sponsorships, not advertising:

Traditional advertising is not always available to website developers and the big companies tend to be interested mainly in an audience of millions, but there are tons of smaller sources of support, she says.

* Building a network of skills:

There is only so much one person can do, and Hamilton draws from a loosely knit association of professionals that ranges from web designers, to regular contributors, to brand management specialists. She gets the skills she needs without the expense of a full-time staff.