Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
9f3474c
Add solution templates
gaabi16 Dec 11, 2025
bfeb02f
Translate solution file form romanian to english
gaabi16 Dec 11, 2025
3e2622b
Add solution_3.md
gaabi16 Dec 11, 2025
ed59dfd
Add a comparative analysis of the proposed solutions
gaabi16 Dec 11, 2025
fd7a23c
Refactor solution_3.md
gaabi16 Dec 11, 2025
c5c44f1
Fix solutions analysis
gaabi16 Dec 11, 2025
f6b87d6
Fix solution_2.md
gaabi16 Dec 11, 2025
f471808
Add first implementation of the skill (incomplete)
gaabi16 Dec 12, 2025
167e21d
Refactor skill files in order to integrate slash commands
gaabi16 Dec 12, 2025
3b23a6a
Add script for testing through a simulation
gaabi16 Dec 12, 2025
677f34c
Update instructions.md to have a more active agent
gaabi16 Dec 12, 2025
bc3102a
Add scripts for conflict simulations that test the agent
gaabi16 Dec 12, 2025
9b52b29
Update instructions.md to improve usability
gaabi16 Dec 12, 2025
a9c713f
Update instructions.md to improve reasoning capabilities of the agent
gaabi16 Dec 12, 2025
deed032
Adjust generated folders naming
gaabi16 Dec 12, 2025
8e57b31
Add final changes
gaabi16 Dec 12, 2025
2a44f65
Add Makefile for easy cleaning
gaabi16 Dec 12, 2025
10c827a
Add README documenting git merge conflict resolution skill
gaabi16 Dec 12, 2025
06bf257
Merge pull request #1 from gaabi16/gemini-cli
gaabi16 Dec 12, 2025
97db582
added: implementation for multiple Language suported for the skill
mariobullet Dec 13, 2025
e893b35
added: documentation for multiple language suport
mariobullet Dec 13, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,6 @@ Cargo.lock
# be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
# and can be added to the global gitignore or merged into this file. For a more nuclear
# option (not recommended) you can uncomment the following to ignore the entire idea folder.
#.idea/
#.idea/

.DS_Store
Loading