Search Results for "resolution"

...The system treats the working copy as a real commit, removing the need for staging areas or stashes. Jujutsu records conflicts as first-class objects, making conflict resolution more flexible and reliable. It also maintains a complete operation log, allowing users to undo almost any action. Jujutsu aims to deliver powerful history rewriting and rebasing features without the complexity commonly associated with traditional tools.

Grgit is a Groovy‑friendly wrapper around Eclipse JGit that simplifies Git operations within Groovy scripts or Gradle builds. It provides a cleaner, fluent API for common Git tasks (clone, commit, tag, branch), and ships as a Gradle plugin for easy project integration.

Perform a merge between two branches incrementally. If conflicts are encountered, figure out exactly which pairs of commits conflict, and present the user with one pairwise conflict at a time for resolution. Reduce the pain of resolving merge conflicts to its unavoidable minimum, by finding and presenting the smallest possible conflicts: those between the changes introduced by one commit from each branch. Allow a merge to be saved, tested, interrupted, published, and collaborated on while it is in progress. Multiple incremental merges can be in progress at the same time. ...

BinCoMerge is a binary files diff at byte resolution. It shows hexadecimal and raw ASCII data. BinCoMerge is seeking for common blocks from the bigger ones to the lower ones. It works by levels of minimum block sizes which are powers of 2. For example, with a file sizing between 16 KiB and 32 KiB, Bincomerge will firstly seek for all common blocks bigger than 16 KiB. Then, it will seek for all common bigger than 8 KiB, then 4KiB, 2KiB, 1024 Bytes...

...This connector is based on the SVKit toolkit, which in itslef is a pure Java based SVN library. Apart from offering Subversion functionality this connector also allows you to extend and plugin your own custom conflict resolution handler, using Eclipse's extension points. For more information see the Wiki.

Keros is an environment for cross platform scripting and development, providing project management capabilities such as building and library dependency resolution.