Skip to content
Feature

Version Control: Git Built into PocketCode

Git without leaving the editor: stage, commit, branches, merge, stash and GitHub pull requests, built into PocketCode.

Updated:
6 min
By Pelayo Naredo

Version Control: Git Built into PocketCode

Git is fundamental in modern development. PocketCode has it built in (the JGit library, no git program to install), so you can manage your code without leaving the app. The local terminal has no git command: everything below is done from screens, and the terminal has its own small Git Panel.

Visual Git interface

Source Control

Source Control is the editor's Git panel (editor menu → Git, or Ctrl+Shift+G on a physical keyboard, or tap the branch name in the status bar). It shows the branch, the commits you haven't pushed (↑) and haven't pulled (↓), and groups your files as:

  • Staged Changes — Ready for the next commit
  • Changes — Modified tracked files
  • Untracked — New files

In a repository, the file explorer also marks each changed file (modified, added, untracked, deleted or renamed) and the folders that contain changes.

Visual diff

Tap any changed file to read its diff in one unified list:

  • Added lines in green
  • Deleted lines in red
  • Line numbers and +N −M totals, with a Swap button to exchange the two sides

Basic operations

Making a commit

In Source Control:

  1. Stage the files you want (Stage All for the lot), or use Stage by hunk to stage only some blocks of a file
  2. Write the message in Commit message…
  3. Tap Commit

The editor doesn't show a message after a commit, push, pull, merge or stash, so check the lists and the ↑↓ counters. From Projects, the project card's Commit button opens Commit Changes with Commit, Commit & Push and Amend last commit, and the terminal's Git Panel has Commit changes too.

Working with branches

Branches live on the project card in Projects: tap Git, then Branch. Tap a branch to Switch to this branch, or tap Create new branch (with a switch to move to it right away). These rows appear once the project has a remote (origin); the terminal's Git Panel can also switch branches and create one locally. Only local branches are listed, and there is no button to delete or rename a branch.

Merge and rebase

In Source Control, tap Merge, pick a local branch and tap Merge into your current branch. There is no guided conflict resolver for a merge or a pull:

  1. If the same lines changed on both sides, the conflict markers (<<<<<<<, =======, >>>>>>>) stay in your files
  2. Open the affected files and keep the version you want
  3. Stage and commit, or try the pull again

The guided resolver (Ours, Theirs, Both, block by block) exists only inside the interactive rebase (Pick, Reword, Squash, Fixup, Drop, with a backup you can restore). It opens from the ⋮ menu of GitHub PRs & Issues, and only when the project's origin is on github.com.

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

  • Upload changes (push) and Download changes (pull)
  • Pull Requests from the app: list, create, merge, close and comment
  • Issues: list, create, close and comment
  • CI: the checks of a pull request (GitHub Actions and others) in one summary

GitLab

  • Clone from your repositories, publish a local project and push/pull over HTTPS
  • The status of its latest CI pipeline run in the Backend Manager's status feed

Bitbucket

  • Clone from your repositories, publish a local project and push/pull over HTTPS
  • The status of its latest Pipelines run in the Backend Manager's status feed

Pull/merge requests from inside the app are GitHub-only today (github.com). For GitLab and Bitbucket, open merge requests and pull requests in their web UI.

Git stash

Save changes temporarily without committing. In Source Control:

  1. Tap Stash, then Stash changes
  2. Later, tap an entry to Apply it, Pop it or Drop it

Keep in mind that new (untracked) files aren't stashed, the optional stash message isn't saved with the entry, and Pop always takes the newest entry; to restore a specific one, use Apply on it and then Drop.

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

The AI message button in Source Control suggests messages in four styles (Conventional, Descriptive, Imperative, Emoji). It is not AI: it is a local, rule-based suggestion built from the names of the files you changed, so check it before you use it.

Configuration

Your name on commits

Commits carry the name and email saved for the repository. Set them under Projects → the project card → Git → Your name on commits. They start filled from the repository, your connected service or your PocketCode account.

Authentication

PocketCode talks to remotes over HTTPS only (SSH remotes are not supported). GitHub and GitLab connect with the OAuth device flow: under Settings → Integrations → Connected Services the app shows a code and you approve it in the browser. Bitbucket uses your Atlassian email plus an API token. Clone, fetch, pull, and push to private repos work with the connected account, and the token is sent only to github.com, gitlab.com and bitbucket.org; a remote on any other host (GitHub Enterprise, a self-hosted GitLab) gets no credentials. The tokens of your connected services are stored encrypted on the device. If you sign in to PocketCode itself with GitHub, that GitHub token is also stored, encrypted, on PocketCode's backend, which uses it to list your repositories. Every local operation — commit, branch, merge, stash, diff — needs no connection once you are signed in (the app needs a connection to sign in).


With integrated Git, PocketCode gives you the everyday Git workflow on your phone. Make commits, manage branches, and collaborate with your team without leaving the PocketCode editor. What isn't there: SSH remotes, Git LFS, submodules, commit signing and hooks.