Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: phronmophobic/gimple
base: ebb26ef786
...
head fork: phronmophobic/gimple
compare: 133155061f
Checking mergeability… Don't worry, you can still create the pull request.
  • 2 commits
  • 2 files changed
  • 0 commit comments
  • 1 contributor
Showing with 3 additions and 0 deletions.
  1. +1 −0  gimple/ConflictViewController.m
  2. +2 −0  gimple/Git.m
View
1  gimple/ConflictViewController.m
@@ -139,6 +139,7 @@ -(IBAction)pressedContinue:(id)sender
break;
}
}
+ [git commit:@"merge with conflicts"];
[self.view removeFromSuperview];
[git sync];
View
2  gimple/Git.m
@@ -256,12 +256,14 @@ -(void)sync
-(BOOL) chooseMine:(NSString*)filename
{
[self gitWithArgs:@"checkout", @"--ours",@"--", filename, nil];
+ [self gitWithArgs:@"add", @"--u",@"--", filename, nil];
return YES;
}
-(BOOL) chooseTheirs:(NSString*)filename
{
[self gitWithArgs:@"checkout", @"--theirs", @"--",filename, nil];
+ [self gitWithArgs:@"add", @"--u",@"--", filename, nil];
return YES;
}

No commit comments for this range

Something went wrong with that request. Please try again.