Put the knife down and take a green herb, dude. (c) Ruffin Bailey 2001-2021

title: Put the knife down and take a green herb, dude.	descrip: One feller's views on the state of everyday computer science & its application (and now, OTHER STUFF) who isn't rich enough to shell out for www.myfreakinfirst-andlast-name.com Using 89% of the same design the blog had in 2001.
FOR ENTERTAINMENT PURPOSES ONLY!!! Back-up your data and, when you bike, always wear white. As an Amazon Associate, I earn from qualifying purchases. Affiliate links in green.
x MarkUpDown is the best Markdown editor for professionals on Windows 10. It includes two-pane live preview, in-app uploads to imgur for image hosting, and MultiMarkdown table support. Features you won't find anywhere else include... MarkUpDown Multiline Table & Bootstrap Grid support. Beautiful Easy Actions that keep the Markdown flowing. HTML paste to paste HTML source into your documents. You've wasted more than $15 of your time looking for a great Markdown editor. Stop looking. MarkUpDown is the app you're looking for. Learn more or head over to the 'Store now!

Saturday, June 30, 2012
Include the base version in your git conflict files A Small Matter of Programming: Painless Merge Conflict Resolution in Git: 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 This setting gives you a third chunk in each conflict during a merge that shows the contents of the original from which the two current files you're merging originated. Below image is from "A Small Matter of Programming". Traditional conflict files have B & C. The new content is from A. `<<<<<<< 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 posted by ruffin at 6/30/2012 05:51:00 PM

<< Older \| Newer >>

All posts can be accessed here:

Just the last year o' posts:

URLs I want to remember:
* Atari 2600 programming on your Mac	* joel on software (tip pt)
* Professional links: resume, github, paltry StackOverflow	* Regular Expression Introduction (copy)
* The hex editor whose name I forget	* JSONLint to pretty-ify JSON
* Using CommonDialog in VB 6	* Free zip utils
* git repo mapped drive setup	* Regex Tester
* Read the bits about the zone	* Find column in sql server db by name
* Giant ASCII Textifier in Stick Figures (in Ivrit)	* Quick intro to Javascript
* Don't [over-]sweat "micro-optimization"	* Parsing str's in VB6
* .ToString("yyyy-MM-dd HH:mm:ss.fff", CultureInfo.InvariantCulture); (src)	* Break on a Lenovo T430: Fn+Alt+B
email if ya gotta, RSS if ya wanna RSS, (?_?), ¢, & ? if you're keypadless

The postings on this site are [usually] my own and do not necessarily reflect the views of any employer, past or present, or other entity.
About Our Author