>
Claude_Code_Tips
tip_0704.sh
[ESC] Exit
$
cat
./chapter_07/
0704.md
[
Git Workflow
]
Resolve Conflicts
// merge conflict
Resolve Conflicts
Let AI resolve conflicts
"Help me resolve merge conflicts"
"How should I handle this conflict?"
AI will
Share
Copy link
Random
<
Create Branch
Prev
Progress
[83/139]
Create PR
Next
>
←
Prev
/
Next
→