abdullah/til
1
0
Fork 0
mirror of https://github.com/jbranchaud/til synced 2026-10-31 00:13:27 +00:00
Code Issues Projects Releases Wiki Activity

Add Ask An Agent To Fix Merge Conflicts as a Claude Code TIL

Browse Source
This commit is contained in:
jbranchaud
2026-09-30 13:07:00 -05:00
parent c185256034
commit d9f4daa41d
2 changed files with 50 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
README.md
+2 -1
View File
@@ -10,7 +10,7 @@ working across different projects via [VisualMode](https://www.visualmode.dev/).
For a steady stream of TILs, [sign up for my newsletter](https://visualmode.kit.com/newsletter).
_1883 TILs and counting..._
_1884 TILs and counting..._
See some of the other learning resources I work on:
@@ -168,6 +168,7 @@ If you've learned something here, support my efforts writing daily TILs by
### Claude Code
- [Allow Edits From The Start](claude-code/allow-edits-from-the-start.md)
- [Ask An Agent To Fix Merge Conflicts](claude-code/ask-an-agent-to-fix-merge-conflicts.md)
- [Distinguish Sessions With Different Colors](claude-code/distinguish-sessions-with-different-colors.md)
- [Monitor Usage Limits From CLI](claude-code/monitor-usage-limits-from-cli.md)
- [Open Current Prompt In Default Editor](claude-code/open-current-prompt-in-default-editor.md)