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!

Friday, June 22, 2012
WinMerge and conflict files -- useless Comparing and merging files - WinMerge 2.12 Manual: 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. Look, I understand you can't save the changes into the right side, but come on. The whole goal is to go through and have identical files. I should be able to use the right side as a crutch and select either. Even if I can't save it, the freakin left side should be able to "override" the edits. Otherwise I'll never have identical "files" and be able to visualize "done". Sheesh. It's free, I know. I know. I KNOW. But sheesh. Labels: git, merge posted by ruffin at 6/22/2012 03:57: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