What You’ll Learn
- Use Source Control for staging and commits
- How Verdent handles Git operations
- Rebasing changes to master
Source Control Panel
For manual Git operations, use the Source Control panel (Ctrl+Shift+G / Cmd+Shift+G):
- View changed files
- Stage and unstage changes
- Commit with custom messages
- Diff view for individual files
- Revert changes
Git Through Verdent
Ask Verdent to handle Git operations naturally:- Commits
- History
- Branches
Workspace Operations
Each workspace has its own Git branch. Use Workspace Actions in the Top Bar:| Operation | Action |
|---|---|
| Sync from Main | Pull latest changes from main branch into workspace |
| Rebase to Main | Apply workspace changes to main branch |
| Create PR | Create a pull request from the current workspace branch |
Rebase Workflow
1
Complete Work
Finish your feature or fix in the workspace
2
Commit Changes
Use Source Control (
Ctrl+Shift+G) to stage changes and commit with a descriptive message3
Test
Run tests to ensure everything works
4
Rebase
Click Workspace Actions → Rebase to Main
5
Clean Up
Click Delete Workspace in the Workspace Bar
Terminal Access (Optional)
For advanced Git operations, use the integrated terminal (Ctrl+J):
Common terminal commands
Common terminal commands
FAQs
What happens to uncommitted changes when switching workspaces?
What happens to uncommitted changes when switching workspaces?
Each workspace maintains its own state. Uncommitted changes in one workspace don’t affect others.
How do I resolve conflicts when syncing?
How do I resolve conflicts when syncing?
- Click Workspace Actions → Sync from Main
- Conflicts appear in affected files
- Ask Verdent to help:
Help me resolve the conflicts in @userService.ts - Stage resolved files and complete the sync
Why does Verdent use rebase instead of merge?
Why does Verdent use rebase instead of merge?
Rebase creates cleaner linear history and easier code review. Each workspace produces a clean branch that rebases onto the main branch when complete.
Can I push workspace branches to remote?
Can I push workspace branches to remote?
Yes. Each workspace branch is a normal Git branch. Use
git push origin branch-name for backup, code review, or collaboration.