fix conflicts

Author: wugeer

CHANGELOG.md

@@ -15,6 +15,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * add `use_selection_fg` to theme file to allow customizing selection foreground color [[@Upsylonbare](https://github.com/Upsylonbare)] ([#2515](https://github.com/gitui-org/gitui/pull/2515))
 
 ### Changed
+* Stash pop removes stash from list even when there are conflicts([#2372](https://github.com/extrawurst/gitui/issues/2372))
 * improve syntax highlighting file detection [[@acuteenvy](https://github.com/acuteenvy)] ([#2524](https://github.com/extrawurst/gitui/pull/2524))
 * Updated project links to point to `gitui-org` instead of `extrawurst`  [[@vasleymus](https://github.com/vasleymus)] ([#2538](https://github.com/gitui-org/gitui/pull/2538))
 * After commit: jump back to unstaged area [[@tommady](https://github.com/tommady)] ([#2476](https://github.com/extrawurst/gitui/issues/2476))

asyncgit/src/error.rs

@@ -21,6 +21,10 @@ pub enum Error {
 	#[error("git: conflict during rebase")]
 	RebaseConflict,
 
+	///
+	#[error("git: conflict during stash apply")]
+	StashApplyConflict,
+
 	///
 	#[error("git: remote url not found")]
 	UnknownRemote,

asyncgit/src/sync/stash.rs

@@ -50,7 +50,21 @@ pub fn stash_pop(
 
 	let index = get_stash_index(&mut repo, stash_id.into())?;
 
-	repo.stash_pop(index, None)?;
+	// todo: The allow_conflicts parameter set in CheckoutBuilder is not actually taking effect.
+	let mut checkout = CheckoutBuilder::new();
+	checkout.allow_conflicts(false);
+
+	let mut opt = StashApplyOptions::default();
+	opt.checkout_options(checkout);
+	repo.stash_apply(index, None)?;
+
+	// check for merge conflicts
+	if repo.index()?.has_conflicts() {
+		return Err(Error::StashApplyConflict);
+	}
+
+	// remove the entry at the specified index from the stash list
+	repo.stash_drop(index)?;
 
 	Ok(())
 }