Documentation for fixing conflicts outside of GitButler

[Caleb-T-Owens]

No description provided.

[vercel]

The latest updates on your projects. Learn more about Vercel for GitHub.

Project	Deployment	Review	Updated (UTC)
gitbutler-docs	Ready	Preview, Comment	Dec 17, 2025 6:08pm

[github-actions]

Broken Link Checker

22 broken links found. Links organised below by source page, or page where they were found.

1) /guide

Target Link	Link Text	Reason
https://app.gitbutler.com/downloads	"downloading"	HTTP_500

2) /cli-guides/cli-tutorial/branching-and-commiting

Target Link	Link Text	Reason
https://www.notion.so/Rubbing-2545a4bfdeac80209d37cd4d629316cc?pvs=21	"Rubbing"	HTTP_404

3) /features/branch-management/rules

Target Link	Link Text	Reason
/docs/features/branch-management/virtual-branches	"Virtual Branches"	HTTP_404
/docs/features/branch-management/branch-lanes	"Branch Lanes"	HTTP_404
/docs/features/branch-management/ai-assistance	"AI Assistance"	HTTP_404

4) /features/branch-management/moving-branches

Target Link	Link Text	Reason
/docs/features/branch-management/stacked-branches	"Stacked Branches"	HTTP_404
/docs/features/branch-management/branch-lanes	"Branch Lanes"	HTTP_404
/docs/features/branch-management/virtual-branches	"Virtual Branches"	HTTP_404

5) /commands/but-new

Target Link	Link Text	Reason
https://github.com/gitbutlerapp/gitbutler-docs/issues/new?label=docs&title=Feedback+for+page+%22commands/but-new%22	"Give us feedback"	HTTP_429

6) /commands/but-push

Target Link	Link Text	Reason
https://github.com/gitbutlerapp/gitbutler-docs/issues/new?label=docs&title=Feedback+for+page+%22commands/but-push%22	"Give us feedback"	HTTP_429

7) /commands/but-publish

Target Link	Link Text	Reason
https://github.com/gitbutlerapp/gitbutler-docs/issues/new?label=docs&title=Feedback+for+page+%22commands/but-publish%22	"Give us feedback"	HTTP_429

8) /commands/but-forge

Target Link	Link Text	Reason
https://github.com/gitbutlerapp/gitbutler-docs/issues/new?label=docs&title=Feedback+for+page+%22commands/but-forge%22	"Give us feedback"	HTTP_429

9) /commands/but-oplog

Target Link	Link Text	Reason
https://github.com/gitbutlerapp/gitbutler-docs/issues/new?label=docs&title=Feedback+for+page+%22commands/but-oplog%22	"Give us feedback"	HTTP_429

10) /commands/but-undo

Target Link	Link Text	Reason
https://github.com/gitbutlerapp/gitbutler-docs/issues/new?label=docs&title=Feedback+for+page+%22commands/but-undo%22	"Give us feedback"	HTTP_429

11) /commands/but-restore

Target Link	Link Text	Reason
https://github.com/gitbutlerapp/gitbutler-docs/issues/new?label=docs&title=Feedback+for+page+%22commands/but-restore%22	"Give us feedback"	HTTP_429

12) /commands/but-snapshot

Target Link	Link Text	Reason
https://github.com/gitbutlerapp/gitbutler-docs/issues/new?label=docs&title=Feedback+for+page+%22commands/but-snapshot%22	"Give us feedback"	HTTP_429

13) /community/open-source

Target Link	Link Text	Reason
https://github.com/gitbutlerapp/gitbutler-docs/issues/new?label=docs&title=Feedback+for+page+%22community/open-source%22	"Give us feedback"	HTTP_429

14) /features/ai-integration/cursor-hooks

Target Link	Link Text	Reason
https://github.com/gitbutlerapp/gitbutler-docs/issues/new?label=docs&title=Feedback+for+page+%22features/ai-integration/cursor-hooks%22	"Give us feedback"	HTTP_429

15) /features/forge-integration/gitlab-integration

Target Link	Link Text	Reason
https://github.com/gitbutlerapp/gitbutler-docs/issues/new?label=docs&title=Feedback+for+page+%22features/forge-integration/gitlab-integration%22	"Give us feedback"	HTTP_429

16) /features/ai-integration/ai-overview

Target Link	Link Text	Reason
https://github.com/gitbutlerapp/gitbutler-docs/issues/new?label=docs&title=Feedback+for+page+%22features/ai-integration/ai-overview%22	"Give us feedback"	HTTP_429

17) /features/ai-integration/mcp-server

Target Link	Link Text	Reason
https://github.com/gitbutlerapp/gitbutler-docs/issues/new?label=docs&title=Feedback+for+page+%22features/ai-integration/mcp-server%22	"Give us feedback"	HTTP_429

18) /features/ai-integration/claude-code-hooks

Target Link	Link Text	Reason
https://github.com/gitbutlerapp/gitbutler-docs/issues/new?label=docs&title=Feedback+for+page+%22features/ai-integration/claude-code-hooks%22	"Give us feedback"	HTTP_429