Skip to content
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.

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

Fix issues with merge algorithm #37

Closed
le-git-imate opened this issue Sep 3, 2019 · 0 comments
Closed

Fix issues with merge algorithm #37

le-git-imate opened this issue Sep 3, 2019 · 0 comments
Labels
bug Something isn't working

Comments

@le-git-imate
Copy link
Owner

le-git-imate commented Sep 3, 2019

Description of issue or feature request
The merge algorithm can not support some merge requests due to issues in two functions:(1) xmerge/xdl_refine_conflicts, (2) xdiffi/xdl_split.

You can replicate the issue in the xdl_refine_conflicts function, if, for example, you perform the following PRs by the le-git-imate extension:
golang/go#33882
github/gitignore#3121

You can replicate the issue in xdl_split function, if, for example, you perform the following PRs by the le-git-imate extension:
vuejs/vue#10167
golang/go#33870
facebook/react#16591
ytdl-org/youtube-dl#22063

Current behavior

  • le-git-imate does not perform merge requests if xmerge/xdl_refine_conflicts and xdiffi/xdl_split functions get involved.

Expected behavior

@le-git-imate le-git-imate added the bug Something isn't working label Sep 3, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working
Projects
None yet
Development

No branches or pull requests

1 participant