Skip to content

Practice merge conflict resolution #45

Closed

Description

@Geremi57

What type of challenge do you want?

text

(Optional) Scenario file name

No response

Activity

  1. github-actions commented on Aug 14, 2026

    @github-actions

    🎉 Conflict scenario ready for @Geremi57

    🔹 Branch main: version 2
    🔹 Branch conflict-8a269716: version 3

    File to resolve:
    Solutions/Conflict-fixes/Geremi57-txt_scenario.md

    Fork the repo, resolve the conflict, then open a PR to complete the task! 💪

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

Metadata

Metadata

Assignees

No one assigned

    Projects

    No projects

      Milestone

      No milestone

      Relationships

      None yet

      Development

      No branches or pull requests

      Issue actions