development/github-desktop
development/github-desktop
1
0
Fork 0
mirror of https://github.com/desktop/desktop synced 2024-09-13 21:31:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update docs/technical/rebase-flow.md

Browse source 
Co-Authored-By: billygriffin <5091167+billygriffin@users.noreply.github.com>
This commit is contained in:
William Shepherd 2019-05-01 12:06:46 -04:00 committed by GitHub
parent 76d562c769
commit 28d4434764
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
docs/technical/rebase-flow.md
View file

@ -62,7 +62,7 @@ there will be some words here eventually to help explain how the solution works.
If the target branch is tracking a remote branch and the user has enabled the
_Show confirmation dialog before force pushing_ setting, Desktop
will check if any commits exist in the range
`<upstream_oid>..<remote_branch_oid>`, where `<remote_branch_oid>` is the tip of
`<upstream_oid>..<remote_branch_oid>` before starting the rebase, where `<remote_branch_oid>` is the tip of
the tracking branch.
This check is important to identify any remote commits that will be caught in