Skip to content

Conversation

@thegeneralist01
Copy link

@thegeneralist01 thegeneralist01 commented Jun 30, 2025

Add a command to abort a merge conflict. Equivalent to git reset --merge.

This PR and #934 address the following issues:
Closes #702
Closes #872
Closes #906
Partially addresses #920

@thegeneralist01 thegeneralist01 marked this pull request as ready for review June 30, 2025 08:12
@thegeneralist01
Copy link
Author

Also, a few things to note in the changes.

  • 61f5101: I changed the build platform to node - the project wouldn't build otherwise.
  • 5aee66f: Add isomorphic-git as a vendor package - changes made to add a merging strategy. Bumped up a few versions due to security issues.

@Vinzent03
Copy link
Owner

As for your other pr, please don't add isomorphic-git as an archive or change other build configuration.
What is the exact workflow where this command helps? There is also the Raw Command command to run arbitrary commands like merge --abort.

@thegeneralist01
Copy link
Author

There is also the Raw Command command to run arbitrary commands like merge --abort.

Didn't know this. Cool, then, you can close this one if you want.

@Vinzent03 Vinzent03 closed this Jul 25, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[Bug]: git mobile is unable to resolve merge conflicts Auto-merge option to prioritize remote changes [Feature]: Force pull / reset --hard HEAD

2 participants