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

[BUG] "Merge conflict marker" object does not actually exist. #3965

Open
Sadhorizon opened this issue Jan 4, 2025 · 0 comments · May be fixed by #3974
Open

[BUG] "Merge conflict marker" object does not actually exist. #3965

Sadhorizon opened this issue Jan 4, 2025 · 0 comments · May be fixed by #3974
Labels
Bug Something isn't working

Comments

@Sadhorizon
Copy link
Contributor

Reproduction:

  • Run Resolve Map Conflicts.bat.
  • Console says it has placed markers on conflicted tiles.
  • Open the conflicted map in SDMM.
  • They get deleted due to not being defined anywhere in code.
@Sadhorizon Sadhorizon added the Bug Something isn't working label Jan 4, 2025
@Ical92 Ical92 linked a pull request Jan 8, 2025 that will close this issue
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
Bug Something isn't working
Projects
None yet
Milestone
No milestone
Development

Successfully merging a pull request may close this issue.

Properly marks merge conflicts in map editor Ical92/Shiptest
1 participant
@Sadhorizon