Skip to content

Add docs for conflict resolution and fuse spots #76

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
Merged
merged 3 commits into from
Dec 13, 2024
Merged

Add docs for conflict resolution and fuse spots #76

merged 3 commits into from
Dec 13, 2024

Conversation

stefanhahmann
Copy link
Collaborator

@stefanhahmann stefanhahmann commented Dec 13, 2024 •
edited
Loading

This PR

  • Adds documentation for conflict resolution command
  • Adds documentation for fuse spots command
  • Adds progress feedback for conflict resolution

@stefanhahmann stefanhahmann self-assigned this Dec 13, 2024
@stefanhahmann stefanhahmann changed the title Conflict resolution Add docs for conflict resolution and fuse spots Dec 13, 2024
@stefanhahmann stefanhahmann merged commit 48dc5ff into master Dec 13, 2024
1 check passed
@stefanhahmann stefanhahmann deleted the conflict_resolution branch December 13, 2024 15:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@stefanhahmann stefanhahmann

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@stefanhahmann