Search Results for "sims 3 tool"

A convenient command-line tool helping you keep repositories clean. Supports deletion of both local and remote branches. Detects multiple forms of de-facto merges (rebase merges, squash merges (needs --effort=3), single or range cherry-picks… leveraging git cherry). Supports workflows with multiple release branches, e.g. only delete branches that have been merged to all of master, dev and staging.

YaDT - Yet another Diff Tool. It is another front-end for diff and in earlier versions diff3 utility. With YaDT you can compare and merge 2 and/or 3 files. YaDT is written on Tcl/Tk and wrapped in a single executable file with the help of sdx and tclkit. diff and cvs utilities are embedded inside YaDT. Also, YaDT supports Git and Mercurial repositories, but git and hg are not embedded inside YaDT, you should have git/hg executable in your path environment.

Build and test your web applications all in one environment with Aptana Studio 3, the industry’s leading web application IDE. A powerful web development engine, Aptana Studio enables you to build, edit, preview and debug with support for HTML5, CSS3, JavaScript, Python, PHP and Ruby on Rails.

Tracking a Xcode project in a version control system is annoying. Simply adding files can lead to merge conflicts that have to be solved manually, although it would be possible to resolve the conflict automatically if the merge algorithm would be aware of the structure of Xcode's project file. After long and annoying merge sessions in one of my projects, I came to the conclusion, that writing a merge driver for git which understands the structure of the project file would be a worthwhile...