To find the changes that went into each branch, we need to know what the merge base (state A) looks like. The most basic mechanism by which git allows us to do so is to set the merge.conflictstyle option to diff3 by executing the command:

$ git config merge.conflictstyle diff3

<<<<<<< HEAD
roses are #ff0000
violets are #0000ff
all my base
are belong to you
|||||||
roses are red
violets are blue
all my base
are belong to you
=======
Roses are red,
Violets are blue,
All of my base
Are belong to you.
>>>>>>> master

Labels: git, noteToSelf

It is true that, at the end of the day, it is inevitable that each American will affect commerce and become a part of it, even if not by choice.

Labels: hats of money, Other Stuff

The revamped iTunes application is set to launch before the end of the year and is said to be one of the largest sets of changes since the iTunes Store's debut in 2003.

Labels: iTunes

Travel shopping site Orbitz is offering more expensive hotels to Mac users because the company found Mac users prefer more luxurious rooms, reports the Wall Street Journal.

The left File pane file header is titled, Theirs File. This side represents the file that is usually in the version control system's repository. This file usually cannot be edited, so WinMerge sets the left File pane to be read-only. This means that differences can be merged only from this file to the other file.

Labels: git, merge

git config --global --edit should tell you the exact location no matter what kind of setup you have--just look at what file comes up in your editor. – MatrixFrog Aug 11 '11 at 17:02

Labels: git

If you want to bring Web API’s behavior more in line with the output of MVC’s Json() helper, you can remove XML support from your API entirely. Just add this to the Application_Start event and you’ll never see XML again...

Labels: json, microsoft, xml

A study (Lui 2006) presents a rigorous scientific experiment in which novice–novice pairs against novice solos experience significantly greater productivity gains than expert–expert pairs against expert solos.[14]

Labels: excel, noteToSelf, oracle, os x

Labels: fonts, macbook

Labels: git, noteToSelf

Then as more people being to link their articles, note this part is key, AND put buttons in, we can change the search results. We are also working to improve the MDN and other such resources as well as pool them together in a more concise manner. This is not something that is a one off item, but a long term commitment for us, by us to improve things.

Ace is a standalone code editor written in JavaScript. Our goal is to create a web based code editor that matches and extends the features, usability and performance of existing native editors such as TextMate, Vim or Eclipse. It can be easily embedded in any web page and JavaScript application. Ace is developed as the primary editor for Cloud9 IDE and the successor of the Mozilla Skywriter (Bespin) Project.

Labels: javascript, mozilla

If the custom merge tool correctly indicates the success of a merge resolution with its exit code, then the configuration variable mergetool..trustExitCode can be set to true. Otherwise, git mergetool will prompt the user to indicate the success of the resolution after the custom tool has exited.

9  [mergetool "sourcetree"]
10         cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh 
 \"$LOCAL\" \"$REMOTE\" -ancest 
11         trustExitCode = false  
12 [apply] 
13         whitespace = nowarn 
14 [merge] 
15         tool = kdiff3

Labels: git, noteToSelf

You can argue that a university education is overrated relative to cost. Most private universities probably aren’t worth the money. A handful at the very top might give you a solid alumni network, access to top-notch researchers, or a name on the resume that opens doors. But most private university costs are disproportionately high relative to their long-term economic value.

HowTo: Turn this feature off completely

In the Location bar, type about:config and press Enter:

about:config

The about:config "This might void your warranty!" warning page may appear. Click I'll be careful, I promise!, to continue to the about:config page. Type browser.newtab.url in the search box:

browser.newtab.url

Labels: firefox, noteToSelf

+, ?, |, {, }, (, and ) must be escaped to use their special function.

Labels: noteToSelf, regexp, vim

Labels: noteToSelf, sqlite

Labels: apple, hats of money

Labels: Coda

Labels: blizzard, firefox, hats of money

Labels: git, noteToSelf

[Q:] You always hear, with regard to software, that managing developers is like herding cats, and what you just said kind of alludes to that. Does that mean one of the problems with getting software projects done on time is the psychology of the people who are actually doing it?

[A:] That’s a huge and fascinating subject. There is this raw fact in the field that the best way to create software would always be to have just one person write it. At Salon, our original content management system, the predecessor to the big one that was a disaster, was a much smaller system that one developer wrote. It was limited, but the process of creating it was much less painful.

Labels: iTunes

Labels: Other Stuff, Randmo

A 3-way merge actually has four important sources of information:

LOCAL – your file with the changes you’ve made to it
REMOTE – the file you’re merging in, possibly authored by someone else
BASE – the common ancestor file that LOCAL and REMOTE came from
MERGE_RESULT – the file resulting from the merge where you resolve conflicts 

You often need to see all four of these pieces of information to make intelligent choices. Where you came from (LOCAL), where the other person’s changes came from (REMOTE), where you both started (BASE) and where you are now (MERGE_RESULT).

Labels: git