#212

New

diff merge tools

Reported by Volkan Ozcelik on JavaScript: from Zero to Hero · 18/07/2018 05:32:43

Assigned to:
Volkan Ozcelik
Priority:
Normal
Status:
New
Category:
Useful Links
Version:
None

to the tools section

<unrelated>
I also realized something.
None of the programming courses (JavaScript or not) talk about how you do things like diff/merge, compare versions etc.
In a few of the videos, I’m actively doing those kinds of stuff.
Well, instead of doing `git diff` or `git cherrypick` I use Tower for git (because I have a life) but at least it show the overall process.

<un-unrelated>
For diff-merge I use two programs: Kaleidoscope, BeyondCompare
BeyondCompare: ugly but fast
Kaleidoscope: cute but slow (especially with large directory diffs)
both of them are paid programs with ~30-days-or-so trials
As far as I know Kaleidoscope does not work in windows.
And neither works in linux. So penguin lowers: you gotta use meld instead ;)

Attachments

No attachment has been uploaded, yet.


Loading comments...