![How to abort the whole git stash process if a merge conflict has occurred in Git? - DEV Community 👩💻👨💻 How to abort the whole git stash process if a merge conflict has occurred in Git? - DEV Community 👩💻👨💻](https://res.cloudinary.com/practicaldev/image/fetch/s--EdNb36Oj--/c_imagga_scale,f_auto,fl_progressive,h_1080,q_auto,w_1080/https://melvingeorge.me/_next/static/images/main-a04e6bf1e165cd1c10ca36845d8a24f3.jpg)
How to abort the whole git stash process if a merge conflict has occurred in Git? - DEV Community 👩💻👨💻
![stashing] successfully popping a stash with conflicts doesn't drop the stash · Issue #7383 · desktop/desktop · GitHub stashing] successfully popping a stash with conflicts doesn't drop the stash · Issue #7383 · desktop/desktop · GitHub](https://user-images.githubusercontent.com/964912/56516638-d67d2d80-64ef-11e9-8635-8120550ce039.png)
stashing] successfully popping a stash with conflicts doesn't drop the stash · Issue #7383 · desktop/desktop · GitHub
![How to abort the whole git stash process if a merge conflict has occurred in Git? - DEV Community 👩💻👨💻 How to abort the whole git stash process if a merge conflict has occurred in Git? - DEV Community 👩💻👨💻](https://res.cloudinary.com/practicaldev/image/fetch/s--yaMz4Zq5--/c_imagga_scale,f_auto,fl_progressive,h_720,q_auto,w_1280/https://melvingeorge.me/_next/static/images/main-a04e6bf1e165cd1c10ca36845d8a24f3.jpg)
How to abort the whole git stash process if a merge conflict has occurred in Git? - DEV Community 👩💻👨💻
![git - Why do I need to modify <master> if I want to merge it into my public <feature1> branch according to Atlassian Stash? - Stack Overflow git - Why do I need to modify <master> if I want to merge it into my public <feature1> branch according to Atlassian Stash? - Stack Overflow](https://i.stack.imgur.com/KPPS4.png)