This is a classic use case for rsync:
rsync -av /source-path/source-dir /destination-path
rsync will copy only new and changed files to the new location.
It is important to understand how a trailing slash on the source argument functions. If there is a trailing slash then the contents of /source-path/source-dir will be copied to destination-path. If ...
I've found the following applications:
It's no longer bundled with Xcode Command Line Tools, you must install Xcode from either the App Store or the Apple Developer Website.
Open sourced beautifier and language aware code comparison tool for many languages.
Can be installed using Homebrew via ...
Stumbled upon this thread today and thought I'd contribute this new cross-platform OSS diff tool that supports file and directory comparision. It is a good alternative to WinMerge for Mac.
Meld is a visual diff and merge tool targeted at developers. Meld helps you compare files, directories, and version controlled projects. It ...
A modern, powerful, but paid (currently Mar-2013 $69.99) file merging application for OS X is Kaleidoscope. It handles folders, files, and even images. Ad copy from the page:
Compare text in Blocks, Fluid and Unified layouts in both Two-Way and Three-Way modes. Quickly navigate and search through the most readable diff you've ever seen.
Another suggestion -- you can authorize itunes on your computer to play content from your wife's account ("iTunes -> Store -> Authorize Account") as well as your own.
And you can do the same for itunes on your wife's computer.
This will allow you to play both you and your wife's content on both of your computers. However, this way you will have to ...
I need to preface this by saying having not worked with .ts files I do not know whether or not they can be simply concatenated using cat and as you saw because the are numerically named they get mixed up when using cat *.ts > masi.ts because it sorts lexicographically, so using a ordered list is in order. With that in mind, here is what I did to create a ...
Araxis Merge (http://www.araxis.com/merge_mac/index.html) is the gold standard in this area and has a similar cost (what is the weight of bits?). There are Windows and Mac versions, and it is truly excellent if you find yourself spending a lot of time doing multiway diffs and merges (more common in these days of distributed version control systems).
The way me and the wife have got around this is to use two accounts but have the same password so we don't have to remember a different password. This way, when you come to update your apps, it doesn't matter which account pops up, it will be the same password.
We also have a third account. Mine, hers and shared.
This is because I have had mine for years ...
I tried: it works.
Here is how:
I have a time machine volume and a backup of it. I update this backup every two months, using Super Duper.
Recently, several successive mistakes made my time machine volume loose its first two years of backups. I then had a primary time machine volume with all backups but first two years and a backup time machine volume ...
The merge option will only show up if you are copying (rather than moving) the folder. Make sure you hold option while you drag the new folder to the location of the old folder. Alternatively, using ⌘+c to copy the new folder and ⌘+v to paste over the old folder should give you the option to merge the files.
If the folders are the same name, drag one to the location of the other, and BEFORE releasing the mouse or trackpad, hold down the Option key. You will be presented with three options, one of which is to Merge.
Despite some positive reports in September, it looks like you won't be able to merge Apple IDs.
You can, however, set up iPhone, iPod Touch, iPad, Mac or PC to use two different accounts for iCloud and purchases:
iPhone, iPad, or iPod touch:
When you first set up your iOS 5 device, enter the Apple ID you want
to use with iCloud. If you skipped the ...
opendiff takes two filename arguments, and an --ancestor parameter with a third filename, to produce a three-way diff, and a --merge parameter to say the output file to use for the conflict resolution.
cmd = "opendiff \"$LOCAL\" \"$REMOTE\" \"$(if test -f \"$BASE\"; then echo \"--ancestor $BASE\"; else echo \"--ancestor $...
This can be done using Automator. Follow this steps:
Create a new Workflow.
Under Actions, Library, Files & Folders add the Get Specified Finder Items as a step.
On the bottom of that step click on Add and select the images.
Next, under Actions, Library, PDFs add the New PDF from Images. The workflow should look like the one on the image:
Configure the ...
I made 2 quick screenshots for you:
1) select thumbnails view:
2) Drag second PDF e.g., from Desktop, into thumbnails pane, but above the thin silver line where the red arrow is pointing at (otherwise it won't be saved). And then just save the PDF
The issue is that you are setting an app bundle in the config when the version control program is expecing a Unix command line.
You should use /usr/bin/opendiff as the command line. I think that is the only chnage you need for the perforce diff you show.
Example git configs for merging are in this question and several other duplicates on StackOverflow.
The rsync command line tool is able to merge two folders.
You'll need to open a terminal window. Take a look at the manual pages
There may be a one liner but the following steps are non-destructive since you won't change your source folders.
Create a new folder (dest)
Sync source1_path to dest
Sync source2_path to dest
Here the script - check ...
I found the answer with iMazing https://imazing.com .
What I did was copy the entire iTunes backup folder from my USB drive to the iTunes backup folder in my machine.
Then I ran the iMazing App and went to the iOS App (app has to be installed) in the connected phone.
Then I right clicked the iOS App and select extract.
At this point, I selected ...
From macOS Sierra documentation.
Merge two folders with the same name:
If you have two folders with identical names at two different locations, you can merge them into a single folder.
Press and hold the Option key, then drag one folder to the location that contains a folder with the same name. In the dialog that appears, click Merge.
There's an application called SemanticMerge for Mac.
SemanticMerge, as the name says :-), is a tool able to merge based on code structure instead of blocks of text. It basically means it parses the code first and then merges based on methods, classes and so on, so it is quite refactor friendly since it can match methods/functions even when they've been ...
Perforce, a source control application, has a free * diff and merge tool that is cross platform and works fine on my mac. It's called P4Merge.
It presents file-diffs very nicely and handles three-way merges like a champ. As a long-time WinMerge user I was very happy with it. ...
Maybe you will find the app SourceTree interesting: http://www.sourcetreeapp.com/ SourceTree is a free Mac client for Git and Mercurial version control systems. Therefor it isn't a general purpose diff or merge tool but it is worth mentioning it.
This has been bugging me for years, most specifically with This American Life and To The Best of Our Knowledge.
The tag that's causing them to be separated is not available via iTunes -- you need an extended tag editor. On the Mac, I used ID3 Editor.
Instructions specifically for ID3 editor:
• Open a "good" podcast file (you can drag it straight from ...
Automator's group emailer is pretty lacking (I could get it working, but not with attachments), so I took a stab at whipping something up in AppleScript for you.
Open up AppleScript Editor and paste this in:
set theFile to choose file
set myMessage to "MESSAGE BODY GOES HERE."
set mySubject to "SUBJECT HERE"
display dialog "Please select the recipients ...
Unless you have some specific needs, I would throw out most of those options and keep it simple: rysnc -aEv (on the default OS X version) or rsync -aXv (on the Homebrew version).
-a is archive mode, which essentially means preserve the metadata (timestamps, permissions, etc.) and do a recursive copy. This is what you want for your standard backup ...
In the end, staying within the Microsoft Office environment is probably the easiest answer. Sorry for not having researched that more thoroughly before asking the question.
"Generate e-mail messages" in the last step was greyed out because Microsoft Outlook was not the default email application. So to make it work:
(Temporarily) Make MS Outlook the default ...