Verdent Docs
This is archived Verdent 1.0 documentation. For current product documentation, see Verdent.

Version Control

Git integration and version control in Verdent

Verdent manages Git automatically through workspace isolation. Each workspace operates on its own branch, with changes rebased to the main branch when complete.

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:

Commit these changes with message "Add user authentication"
Commit current changes as work-in-progress

Verdent reviews changed files, generates a descriptive message, and executes the commit.

Show me the last 10 commits
What changed in the last commit?
Show me the diff between master and this branch
Create a new branch called feature-login
Sync this branch with the latest changes from the main branch

Workspace Operations

Each workspace has its own Git branch. Use Workspace Actions in the Top Bar:

OperationAction
Sync from MainPull latest changes from main branch into workspace
Rebase to MainApply workspace changes to main branch
Create PRCreate a pull request from the current workspace branch

Rebase Workflow

Complete Work

Finish your feature or fix in the workspace

Commit Changes

Use Source Control (Ctrl+Shift+G) to stage changes and commit with a descriptive message

Test

Run tests to ensure everything works

Rebase

Click Workspace Actions → Rebase to Main

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
# Status and diff
git status
git diff

# History
git log --oneline -10

# Reset uncommitted changes
git checkout -- .

# Reset to previous commit (destructive)
git reset --hard HEAD~1

FAQs

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?
  1. Click Workspace Actions → Sync from Main
  2. Conflicts appear in affected files
  3. Ask Verdent to help: Help me resolve the conflicts in @userService.ts
  4. Stage resolved files and complete the sync
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?

Yes. Each workspace branch is a normal Git branch. Use git push origin branch-name for backup, code review, or collaboration.


See Also