Managing Git and Version Control in Lovable Projects

Why version control needs specific setup in Lovable projects

Lovable has its own built-in version history system that tracks every change the AI makes to your project. You can scroll through previous versions in the chat panel, preview any version, and restore to it. For most users, this is sufficient version control. However, for more advanced workflows — collaborating with developers, deploying to Vercel or Netlify, or maintaining a backup outside Lovable — you need GitHub integration. Lovable provides two-way sync with GitHub: changes in Lovable push to GitHub, and changes in GitHub pull back into Lovable. This sync only works on the default branch (main). The most critical rule is to never rename, move, or delete the GitHub repository after connecting it. This breaks the sync permanently and there is no automated recovery. If you need to change the repository, disconnect from Lovable first, make the change on GitHub, then reconnect (which creates a new repository). Branch switching is available as a Labs feature for users who need to work on features in isolation before merging to main.

• GitHub repository renamed or transferred after connecting — permanently breaks sync
• Merge conflicts between Lovable changes and GitHub changes on the same files
• Branch switching not enabled — changes only sync on the main branch by default
• Stale OAuth token after organization rename — Lovable cannot find the repository
• Multiple team members editing the same project simultaneously, creating conflicting versions

Error messages you might see

Before you start

• A Lovable project (version history works on all plans without any setup)
• A GitHub account for Git integration (go to Settings → Connectors → GitHub to connect)
• Workspace admin or owner role in Lovable to manage GitHub connections
• The Lovable GitHub App installed on your GitHub account or organization

How to fix it

<<<<<<< HEAD
// Lovable's version of the component
const Header = () => <h1>Welcome Home</h1>;
=======
// Developer's version from GitHub
const Header = () => <h1>Welcome to Our App</h1>;
>>>>>>> main

// Resolved: kept the developer's version with Lovable's styling
const Header = () => <h1 className="text-3xl font-bold">Welcome to Our App</h1>;

Complete code example

1# Project Agent Instructions
2
3## Version Control Rules
4
5- Do NOT modify files in the /supabase directory without explicit permission
6- Do NOT change the project's routing structure in src/App.tsx without approval
7- Do NOT remove or rename existing component files — create new ones instead
8- When adding features, create new files rather than heavily modifying existing ones
9
10## Code Style
11
12- Use TypeScript strict mode for all new files
13- Follow the existing naming convention: PascalCase for components, camelCase for utilities
14- Import from @/ alias (maps to src/) instead of relative paths
15- Use shadcn/ui components from @/components/ui/ for all UI elements
16
17## Protected Files (do not edit)
18
19- src/integrations/supabase/client.ts
20- src/integrations/supabase/types.ts
21- vite.config.ts
22- tailwind.config.ts
23
24## Deployment Notes
25
26- Build command: npm run build
27- Output directory: dist/
28- Node version: 22
29- Environment variables use VITE_ prefix for client-side access

Best practices to prevent this

• Never rename, move, or delete a GitHub repository that is connected to Lovable — it breaks sync permanently
• Use Lovable's built-in version history for quick undo/revert operations — it is faster than Git for simple rollbacks
• Enable branch switching in Settings → Account → Labs to develop features without affecting the main branch
• Commit frequently in Lovable by making small, focused changes rather than large multi-feature prompts
• Resolve merge conflicts in GitHub rather than trying to fix them from the Lovable editor
• Add an AGENTS.md file to your project root with rules about which files should not be modified by the AI
• If you disconnect GitHub integration, the repository remains on GitHub but sync stops — you can reconnect later to a new repository
• Before major refactors, duplicate the project as a backup in case the version history is not granular enough

Still stuck?

Copy one of these prompts to get a personalized, step-by-step explanation.

Related error patterns