objective-git

objective-git copied to clipboard

This adds a wrapper for the simple `git_merge_file` & `git_merge_file_from_index`. This is somewhat a leftover from #664, because the implementation was already available in libgit2 as the latter, and thus...

tiennou

I've had to use a worktree-ed repo, and I'm a GitX user, which uses Objective-Git. This is a complete work-in-progress, because I just wanted to be able to run against...

tiennou

I have a git repo, and there are some tags in the repo. I use the `- [GTRepository allTagsWithError:]` could not get any tags. I debug the code, I found...

Whirlwind

Swift Package Manager support

2

Feature request: it would be great if it were possible to add objective-git to a project using the Swift Package Manager. I may take a swing at this, at some...

kengruven

Swift Package Manager support

3

Provide Swift Package Manager for libgit2. you can find SPM Module map ref here : https://github.com/apple/swift-package-manager/blob/master/Documentation/Usage.md

ghost

Hi, THe file delete on local branch , modified on remote branch, no conflict when I merge with -(BOOL)mergeBranchIntoCurrentBranch:(GTBranch *)fromBranch withError:(NSError **)error;

zzzzzeus

schriftgestalt

small hack that the underlying problem is visible to the user then the error is displayed with [NSApp presentError:]

1

schriftgestalt

Distributed Mac binary (via Carthage) depends on Homebrew’d openssl

5

``` $ otool -L ObjectiveGit.framework/ObjectiveGit ObjectiveGit: @rpath/ObjectiveGit.framework/ObjectiveGit (compatibility version 1.0.0, current version 1.0.0) /usr/local/opt/openssl/lib/libcrypto.1.0.0.dylib (compatibility version 1.0.0, current version 1.0.0) /usr/local/opt/openssl/lib/libssl.1.0.0.dylib (compatibility version 1.0.0, current version 1.0.0) /usr/lib/libcurl.4.dylib (compatibility version...

mxcl

Create a merge commit when pulling/merging changes where all conflicts can be resolved automatically

3

Given: A local branch and remote branch, both with commits. When merging those, all conflicts can be resolved automatically, for example because different files were changed locally and remote. When...

ralfebert