[GitHub] [arrow] kou commented on a diff in pull request #14430: ARROW-18069: [Docs] Suggest using force with lease initially

[GitBox <gi...@apache.org>]

kou commented on code in PR #14430:
URL: https://github.com/apache/arrow/pull/14430#discussion_r996494256


##########
docs/source/developers/overview.rst:
##########
@@ -64,12 +64,19 @@ checklist for using ``git``:
     straightforward.
 
     Once you have an updated local copy, you can push to your remote repo.  Note, since your
-    remote repo still holds the old history, you would need to do a force push.
+    remote repo still holds the old history, you would need to do a force push.  Most pushes
+    should use `--force-with-lease`

Review Comment:
   ```suggestion
       should use ``--force-with-lease``
   ```



##########
docs/source/developers/overview.rst:
##########
@@ -64,12 +64,19 @@ checklist for using ``git``:
     straightforward.
 
     Once you have an updated local copy, you can push to your remote repo.  Note, since your
-    remote repo still holds the old history, you would need to do a force push.
+    remote repo still holds the old history, you would need to do a force push.  Most pushes
+    should use `--force-with-lease`
 
     .. code:: console
 
-       $ git push --force origin branch
+       $ git push --force-with-lease origin branch
+
+    If that fails, use a regular `--force` push.

Review Comment:
   ```suggestion
       If that fails, use a regular ``--force`` push.
   ```
   
   BTW, should we try `pull` and `push --force-with-lease` before we use `--force`?



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: github-unsubscribe@arrow.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org