Fix conflicts with pull request #459

# Conflicts:
#	ObjectiveGit/GTRepository+Stashing.m

ObjectiveGit/GTRepository+Stashing.h

@@ -73,16 +73,6 @@ NS_ASSUME_NONNULL_BEGIN
 /// Returns YES if the requested stash was successfully applied, NO otherwise.
 - (BOOL)applyStashAtIndex:(NSUInteger)index flags:(GTRepositoryStashApplyFlag)flags checkoutOptions:(nullable GTCheckoutOptions *)options error:(NSError **)error progressBlock:(nullable void (^)(GTRepositoryStashApplyProgress progress, BOOL *stop))progressBlock;
 
-/// Apply stashed changes with a set checkout strategy.
-///
-/// index       - The index of the stash to apply. 0 is the latest one.
-/// flags	    - The flags to use when applying the stash.
-/// strategy    - The checkout strategy to use when applying the stash.
-/// error       - If not NULL, set to any error that occurred.
-///
-/// Returns YES if the requested stash was successfully applied, NO otherwise.
-- (BOOL)applyStashAtIndex:(NSUInteger)index flags:(GTRepositoryStashApplyFlag)flags strategy:(GTCheckoutStrategyType)strategy error:(NSError **)error progressBlock:(nullable void (^)(GTRepositoryStashApplyProgress progress, BOOL *stop))progressBlock;
-
 /// Pop stashed changes (with a default checkout strategy).
 ///
 /// index         - The index of the stash to apply. 0 is the most recent stash.
@@ -94,16 +84,6 @@ NS_ASSUME_NONNULL_BEGIN
 /// Returns YES if the requested stash was successfully applied, NO otherwise.
 - (BOOL)popStashAtIndex:(NSUInteger)index flags:(GTRepositoryStashApplyFlag)flags checkoutOptions:(nullable GTCheckoutOptions *)options error:(NSError **)error progressBlock:(nullable void (^)(GTRepositoryStashApplyProgress progress, BOOL *stop))progressBlock;
 
-/// Pop stashed changes with a set checkout strategy.
-///
-/// index       - The index of the stash to apply. 0 is the most recent stash.
-/// flags       - The flags to use when applying the stash.
-/// strategy    - The checkout strategy to use when applying the stash.
-/// error       - If not NULL, set to any error that occurred.
-///
-/// Returns YES if the requested stash was successfully applied, NO otherwise.
-- (BOOL)popStashAtIndex:(NSUInteger)index flags:(GTRepositoryStashApplyFlag)flags strategy:(GTCheckoutStrategyType)strategy error:(NSError **)error progressBlock:(nullable void (^)(GTRepositoryStashApplyProgress progress, BOOL *stop))progressBlock;
-
 /// Drop a stash from the repository's list of stashes.
 ///
 /// index - The index of the stash to drop, where 0 is the most recent stash.

ObjectiveGit/GTRepository+Stashing.m

@@ -59,16 +59,10 @@ static int stashApplyProgressCallback(git_stash_apply_progress_t progress, void
 	return (stop ? GIT_EUSER : 0);
 }
 
-- (BOOL)applyStashAtIndex:(NSUInteger)index flags:(GTRepositoryStashApplyFlag)flags error:(NSError **)error progressBlock:(nullable void (^)(GTRepositoryStashApplyProgress progress, BOOL *stop))progressBlock {
-	// GTCheckoutStrategyNone may sound odd at first, but this is what was passed in before (de-facto), and libgit2 has a sanity check to set it to GIT_CHECKOUT_SAFE if it's 0.
-	return [self applyStashAtIndex:index flags:flags strategy:GTCheckoutStrategyNone error:error progressBlock:progressBlock];
-}
-
-- (BOOL)applyStashAtIndex:(NSUInteger)index flags:(GTRepositoryStashApplyFlag)flags strategy:(GTCheckoutStrategyType)strategy error:(NSError **)error progressBlock:(nullable void (^)(GTRepositoryStashApplyProgress progress, BOOL *stop))progressBlock {
+- (BOOL)applyStashAtIndex:(NSUInteger)index flags:(GTRepositoryStashApplyFlag)flags checkoutOptions:(GTCheckoutOptions *)options error:(NSError **)error progressBlock:(nullable void (^)(GTRepositoryStashApplyProgress progress, BOOL *stop))progressBlock {
 	git_stash_apply_options stash_options = GIT_STASH_APPLY_OPTIONS_INIT;
 
 	stash_options.flags = (git_stash_apply_flags)flags;
-	stash_options.checkout_options.checkout_strategy = strategy;
 
 	if (progressBlock != nil) {
 		stash_options.progress_cb = stashApplyProgressCallback;
@@ -87,16 +81,11 @@ - (BOOL)applyStashAtIndex:(NSUInteger)index flags:(GTRepositoryStashApplyFlag)fl
 	return YES;
 }
 
-- (BOOL)popStashAtIndex:(NSUInteger)index flags:(GTRepositoryStashApplyFlag)flags error:(NSError **)error progressBlock:(nullable void (^)(GTRepositoryStashApplyProgress progress, BOOL *stop))progressBlock {
-	// GTCheckoutStrategyNone may sound odd at first, but this is what was passed in before (de-facto), and libgit2 has a sanity check to set it to GIT_CHECKOUT_SAFE if it's 0.
-	return [self popStashAtIndex:index flags:flags strategy:GTCheckoutStrategyNone error:error progressBlock:progressBlock];
-}
-
-- (BOOL)popStashAtIndex:(NSUInteger)index flags:(GTRepositoryStashApplyFlag)flags strategy:(GTCheckoutStrategyType)strategy error:(NSError **)error progressBlock:(nullable void (^)(GTRepositoryStashApplyProgress progress, BOOL *stop))progressBlock {
+- (BOOL)popStashAtIndex:(NSUInteger)index flags:(GTRepositoryStashApplyFlag)flags checkoutOptions:(GTCheckoutOptions *)options error:(NSError **)error progressBlock:(nullable void (^)(GTRepositoryStashApplyProgress progress, BOOL *stop))progressBlock{
 	git_stash_apply_options stash_options = GIT_STASH_APPLY_OPTIONS_INIT;
 
 	stash_options.flags = (git_stash_apply_flags)flags;
-	stash_options.checkout_options.checkout_strategy = strategy;
+
 	if (progressBlock != nil) {
 		stash_options.progress_cb = stashApplyProgressCallback;
 		stash_options.progress_payload = (__bridge void *)progressBlock;