Skip to content

docs: add force-with-lease concept article - #97

Merged
Ziinc merged 3 commits into
mainfrom
cursor/force-with-lease-article-5451
Aug 15, 2026
Merged

docs: add force-with-lease concept article#97
Ziinc merged 3 commits into
mainfrom
cursor/force-with-lease-article-5451

Conversation

@Ziinc

@Ziinc Ziinc commented Jul 22, 2026

Copy link
Copy Markdown
Collaborator

Summary

Adds a learn/concepts article on git push --force-with-lease, rewritten from research notes into the treq house voice. Rebased onto current main (resolved Next Steps conflict in merge vs rebase). Treq Push and Sync apply the same lease check without the Git flag.

Contents

  • Conditional force push vs unconditional --force
  • Syntax variants, including <refname>:<expect> for CI
  • Background-fetch lease failure mode
  • --force-if-includes mitigation and its no-op with an explicit expect hash
  • Treq workspace Push and Sync: same expected-tip check via Jujutsu, no --force on the Push button
  • Index entry under Git and Version Control

Rebase

  • Rebased onto main
  • Kept both the force-with-lease Next Steps link and main's zdiff3 / git-rerere links in merge-vs-rebase.mdx
Open in Web Open in Cursor 

@github-actions

github-actions Bot commented Jul 22, 2026

Copy link
Copy Markdown
Contributor

@cursor
cursor Bot force-pushed the cursor/force-with-lease-article-5451 branch from 93e1a3e to bb00d16 Compare July 27, 2026 11:31
@Ziinc
Ziinc marked this pull request as ready for review August 15, 2026 18:42
cursoragent and others added 3 commits August 15, 2026 18:43
Explain --force-with-lease as a conditional force push, cover syntax
variants, the background-fetch hole, and --force-if-includes.

Co-authored-by: Ziinc <Ziinc@users.noreply.github.com>
Fix the broken Next Steps path, add in-body outbound links, and wire
inbound links from related rebase, push, stack, and auto-rebase docs.

Co-authored-by: Ziinc <Ziinc@users.noreply.github.com>
Explain that workspace Push and Sync use the same expected-tip
check as git push --force-with-lease, including the shared
background-fetch limit.

Co-authored-by: Ziinc <Ziinc@users.noreply.github.com>
@cursor
cursor Bot force-pushed the cursor/force-with-lease-article-5451 branch from be153f8 to c53cd79 Compare August 15, 2026 18:44
@Ziinc
Ziinc merged commit 7fa7953 into main Aug 15, 2026
15 checks passed
@Ziinc
Ziinc deleted the cursor/force-with-lease-article-5451 branch August 15, 2026 18:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants