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.

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

Jump to bottom

Merge Conflicts - Accept Target - causes engine to crash #46

Open
SRombauts opened this issue Sep 22, 2017 · 1 comment
Open

Merge Conflicts - Accept Target - causes engine to crash #46

SRombauts opened this issue Sep 22, 2017 · 1 comment
Assignees
@SRombauts
Labels
bug

Comments

@SRombauts
Copy link
Owner

From answerhub Git Merge - Accept Target - causes engine to crash

When I am pulling changes from the server with changes in the file after I edited it locally I am getting a conflict as expected.

As I am trying to resolve the conflict using the Merge Tool, and using the "Accept Target" button, the engine crashes.
@SRombauts SRombauts self-assigned this Sep 22, 2017
@SRombauts SRombauts added the bug label Sep 22, 2017
@SRombauts SRombauts mentioned this issue Sep 25, 2017
Open
SRombauts added a commit that referenced this issue Sep 26, 2017
@SRombauts
Update Known issues with reference to the Github issue tracker
bcea839 
- #34 "outside repository" fatal error
- #37 Rebase workflow: conflicts not detected!
- #46 Merge Conflicts - Accept Target - causes engine to crash bug
- #47 Git LFS conflict resolution not working
- #49 Git LFS 2: False error in logs after a successful push #49
@ccarvalheiro
Copy link
Contributor

ccarvalheiro commented Aug 2, 2019 •
edited

Hi. I opened a pull request in the engine to fix this behavior.

Edit: was merged for 4.24. I think that we may close this issue.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@SRombauts SRombauts

Labels
bug
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
2 participants
@SRombauts @ccarvalheiro