Pulling and conflicts

Get your team's changes, check for news without changing anything, and resolve conflicts.

Pull#

gitpanda pull

From okaypanda.com/git/acme
 updated  marketing/README.md
 new      marketing/docs/spring-sale-plan.md
 removed  docs/old-pricing.md
2 files updated, 1 removed.

• updated / new: written to your folder.
• removed: gone from the company, so removed locally too (unless you've changed it, in which case your copy is kept).
• A file you deleted locally comes back.

Fetch: look without touching#

gitpanda fetch

Your branch is behind 'origin/main' by 3 files.
  (use "gitpanda pull" to update)
	marketing/README.md
	marketing/docs/spring-sale-plan.md
	sales/docs/q3-targets.md

After a fetch, the prompt shows ↓3 until you pull.

Conflicts#

A conflict happens when you changed a document and someone else (a person or an AI employee) changed it in OkayPanda after your last pull.

When you push#

push refuses to overwrite their change:

 ! [rejected]        main -> main (fetch first)
marketing/docs/launch-plan.md was changed in Acme since you pulled.
hint: Run "gitpanda pull" to get their version (yours is kept), then push again.
hint: Or "gitpanda push --force" to replace theirs with yours.

Your commit is kept; nothing is lost.

When you pull#

pull never overwrites your edits. It saves their version next to yours:

CONFLICT: marketing/docs/launch-plan.md changed here and in Acme. Theirs is in marketing/docs/launch-plan.md.theirs; yours is untouched.

Resolving#

1. Open launch-plan.md (yours) and launch-plan.md.theirs (theirs) side by side.
2. Copy what you want to keep into launch-plan.md.
3. Delete launch-plan.md.theirs.
4. Commit and push:

gitpanda commit -am "Merge the team's changes"
gitpanda push

After the pull, their version counts as your starting point, so this push goes through.

Or: keep one side#

.theirs files are ignored by status, add and the prompt, so they never get pushed by mistake.