Search Results for "long file path"

this fork of https://foss.heptapod.net/mercurial/tortoisehg/thg provides some my features: - graph transforms of repo-tree (feature/graphopt/merge-order) - repo-tree navigation keys (feature/repoview-nav-keys) - nav-repoview (feature/nav-repo) - ui: InteractiveUiHandler now can remember choices for prompted file on it's exact path, or recursive pathes

...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 endeavour, as it would save me from solving the merge conflicts for my co-workers. Unfortunately, that script was finished only after the project ended. ...