Skip to content

Practice merge conflict resolution #34

Closed
Closed
Practice merge conflict resolution#34
Labels
beginner friendlygit practice

Description

@Ishmael-quant
Ishmael-quant
opened on Apr 3, 2026

What type of challenge do you want?

text

(Optional) Scenario file name

No response

Activity

  1. Ishmael-quant
    added
    beginner friendly
    git practice
    on Apr 3, 2026

  2. github-actions commented on Apr 3, 2026

    @github-actions
    github-actionsbot
    on Apr 3, 2026 – with GitHub Actions

    🎉 Conflict scenario ready for @Ishmael-quant

    🔹 Branch main: version 2
    🔹 Branch conflict-25a36fad: version 3

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

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

  3. the1Riddle
    closed this as completedon Apr 3, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Metadata

Metadata

Assignees

No one assigned

    Labels

    beginner friendlygit practice

    Projects

    No projects

      Milestone

      No milestone

      Relationships

      None yet

      Development

      No branches or pull requests

      Issue actions