Version Control: Git Built into Pocket Code

Git is fundamental in modern development. Pocket Code integrates Git natively so you can manage your code without needing the terminal.

Visual Git interface

Changes panel

The Git side panel shows in real-time:

• Modified files (M) — Pending changes
• New files (U) — Untracked
• Deleted files (D) — Removed
• Conflicts (C) — Require manual resolution

Visual diff

Tap any modified file to see differences side by side:

• Added lines in green
• Deleted lines in red
• Inline changes highlighted

Basic operations

Making a commit

# From the visual interface:
# 1. Select files in the changes panel
# 2. Write the commit message
# 3. Tap "Commit"

# Or from the integrated terminal:
git add .
git commit -m "feat: add authentication system"

Working with branches

Create and switch branches easily:

# Create new branch
git checkout -b feature/new-feature

# List branches
git branch -a

# Switch branch
git checkout main

# Delete branch
git branch -d feature/completed

Merge and rebase

Pocket Code offers visual conflict resolution:

1. Start the merge from the Git panel
2. If there are conflicts, the resolution editor opens
3. Choose between changes from each branch
4. Confirm the resolution

Workflows

Git Flow

main ─────────────────────── production
  └── develop ─────────────── development
        ├── feature/login ──── feature
        ├── feature/api ────── feature
        └── hotfix/bug-123 ── urgent fix

Trunk-Based Development

main ─────────────────────── single main branch
  ├── short-lived-branch ──── short-lived (< 1 day)
  └── feature-flag ────────── hidden feature

Platform integration

GitHub

• Direct Push/Pull
• Pull Requests from the app
• Issues linked to commits
• Actions status visible

GitLab

• Full repository support
• Merge Requests from Pocket Code
• CI/CD pipeline status

Bitbucket

• Clone and push
• Pull Requests
• Jira integration

Git stash

Save changes temporarily without committing:

# Save changes
git stash save "work in progress"

# List stashes
git stash list

# Recover last stash
git stash pop

# Apply specific stash
git stash apply stash@{2}

Commit message tips

Follow Conventional Commits for clear messages:

feat: add OAuth2 authentication
fix: correct email validation error
docs: update README with setup instructions
style: format code with Prettier
refactor: simplify price calculation logic
test: add tests for payment module
chore: update dependencies

Configuration

Global Git

git config --global user.name "Your Name"
git config --global user.email "your@email.com"
git config --global core.editor "pocket-code"

SSH Keys

Pocket Code can generate and manage SSH keys for passwordless authentication with GitHub, GitLab, and Bitbucket.

---

With integrated Git, Pocket Code gives you full control over your code. Make commits, manage branches, and collaborate with your team without leaving the IDE.