Public

Stricken with fear at the thought of handling a huge conflicted merge file by file, when you know you can just pick one side of the conflict and be done with it?

When

git pull

gives you the bad news...

git mergetool

is usually the first recourse.

Used meld, my default for git mergetool, for the first one. Which fortunately was the only one i wanted to merge manually.

I refused to merge the next one and then took the provided opportunity to cancel the merge.

Then:

Free Software and Open Source

Why Open Source misses the point of Free Software.

The definitions of both are functionally identical, which is what is important of course.

http://opensource.org/docs/osd

I prefer combining the terms open source free software because i find it descriptive altogether even if it is technically/literally redundant.

http://drupal.org/project/collapsiblock
requires: http://drupal.org/project/jstools

See also:

Collapsible Blocks with Cookies
http://keven.squad5.net/node/20

Proposed for the 2010 Boston Skillshare, http://www.bostonskillshare.org/2010

workshop title Start and grow an online presence
short name Working the Web

Benjamin Melançon and others from Agaric Design Collective

Learn how to start a free, cheap, or expensive web site; learn how to increase what you can do on the web; learn basic online strategy and resources available.

If git status works and git anything else doesn't, you are probably in a symlink.

ls -la doesn't show a .git directory, but git status gives results, but git pull says it's not a git repository?

cd up another directory or two (one at a time) and ls -la to see.

Two whole words were too much for me for the commonly used git commands, so i created three-letter aliases.

Maybe if we share, we won't be utterly useless if we are lucky enough to work on one another's machines when we are forced, unready to fly with our stubby three-letter wings, out of our own nests.