Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 3079944

Browse filesBrowse files
tacaswelljklymak
andauthored
DOC: tighten up wording
Co-authored-by: Jody Klymak <jklymak@gmail.com>
1 parent b9d9881 commit 3079944
Copy full SHA for 3079944

File tree

Expand file treeCollapse file tree

1 file changed

+5
-8
lines changed
Filter options
Expand file treeCollapse file tree

1 file changed

+5
-8
lines changed

‎doc/devel/development_workflow.rst

Copy file name to clipboardExpand all lines: doc/devel/development_workflow.rst
+5-8Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -391,18 +391,15 @@ push the new commits to GitHub it will fail with an error that looks like ::
391391
hint: See the 'Note about fast-forwards' in 'git push --help' for details.
392392

393393
What is going on is that by default ``git push`` tries to protect you from
394-
accidentally make commits inaccessible by leaving no reference to them so if a
395-
push *would* effectively discard commits on the remote, ``git`` rejects the
396-
push. When this happens GitHub adds the helpful suggestion to pull the remote
394+
accidentally discarding commits on the remote by rejecting the
395+
push. When this happens, GitHub adds the helpful suggestion to pull the remote
397396
changes and then try pushing again. In some cases, such as if you and a
398397
colleague are both committing and pushing to the same branch, this is the
399398
correct course of action (or rebase your local branch but it is a matter of
400-
taste). Although both of things are good ideas, taken together they are not
401-
what we want to do.
399+
taste).
402400

403-
In the case of having intentionally re-written history we *want* to make the
404-
commits on GitHub inaccessible and replace them with the new-and-improved versions
405-
on our local machines. In these cases what we want to do is ::
401+
However, in the case of having intentionally re-written history we *want* to discard the commits and
402+
replace them with the new-and-improved versions from our local branch. In these cases what we want to do is ::
406403

407404
$ git push --force-with-lease
408405

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.