Skip to content

Try to fix CONFLICT on pop #111

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ecarreras wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Try to fix CONFLICT on pop #111

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b41b316
Try to fix CONFLICT on pop
ecarreras Nov 5, 2021
bc3dbb2
Merge branch 'master' into fix_pop_confict
ecarreras Feb 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions apply_pr/fabfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,6 +238,11 @@ def apply(diff, stash=True, reject=False, message=None):
if stash and stashed:
print(colors.yellow('Unstashing...'))
sudo("git stash pop")
error_on_pop = sudo("test -f .gitignore && git ls-files -om -X .gitignore || git ls-files -u")
if error_on_pop:
sudo("git reset --merge")
print(colors.red('\U000026D4 Error on stash pop. Keeping stash...'))
raise


class GitApplier(object):
Expand Down