Skip to content

Commit aa95bac

Browse files
authored
Update README.md: more info
1 parent 12baadb commit aa95bac

1 file changed

Lines changed: 7 additions & 2 deletions

File tree

Guides/Conflicts_Guide/README.md

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22

33
Welcome to your first hands-on merge conflict resolution task! This guide walks you through resolving a **merge conflict via GitHub** step by step.
44

5-
> 💬 **Note**: This is a GitHub-focused guide. A CLI (local terminal) version is coming soon — feel free to contribute to it!
5+
> [!NOTE]<br>
6+
> This is a GitHub-focused guide. A CLI (local terminal) version is coming soon — feel free to contribute to it!
67
78
## What are merge conflicts?
89

@@ -104,7 +105,11 @@ That was a real contributor skill — well done! You just:
104105
- Fixed a conflict
105106
- Used GitHub’s merge UI
106107

107-
> **Tip**: Try other issues, such as translations, fixes, or CLI contributions! <br>
108+
> [!TIP]<br>
109+
> Did you know you can get a Pair Extraordinaire and Pull Shark badge by doing this task? <br>
110+
> How?: If you resolved a code merge conflict, now is the time to fix a text-based one or vice versa to get the badges. <br>
111+
> **More on Tasks** <br>
112+
> You can try other issues, such as translations, fixes, or CLI contributions! <br>
108113
> Give this repo a star if you found the task useful
109114
110115
## 📢 Help Improve This Guide

0 commit comments

Comments
 (0)