Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ARROW-18069: [Docs] Suggest using force with lease initially #14430

Merged
merged 2 commits into from
Oct 17, 2022

Conversation

bkmgit
Copy link
Contributor

@bkmgit bkmgit commented Oct 16, 2022

This ensures commits are not lost unintentionally, see
https://itnext.io/git-force-vs-force-with-lease-9d0e753e8c41

@github-actions
Copy link

docs/source/developers/overview.rst Outdated Show resolved Hide resolved
docs/source/developers/overview.rst Outdated Show resolved Hide resolved
$ git push --force origin branch
$ git push --force-with-lease origin branch

If that fails, use a regular ``--force`` push.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Instead of stating the --force alternative, I think it would be better to explain in one simple sentence why --force-with-lease is preferrable over --force (because that option is not very well-known).

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the feedback. Needed two sentences. Hopefully ok. Not sure if a link to the documentation is needed.

@pitrou
Copy link
Member

pitrou commented Oct 17, 2022

Thanks @bkmgit, I think few of us knew about this safer alternative.

This ensures commits are not lost unintentionally, see
https://itnext.io/git-force-vs-force-with-lease-9d0e753e8c41

Co-authored-by: Sutou Kouhei <kou@cozmixng.org>
docs/source/developers/overview.rst Outdated Show resolved Hide resolved
docs/source/developers/overview.rst Outdated Show resolved Hide resolved
docs/source/developers/overview.rst Outdated Show resolved Hide resolved
@pitrou
Copy link
Member

pitrou commented Oct 17, 2022

I'm going to merge this. Thank you for the contribution!

@pitrou pitrou merged commit 2f17b54 into apache:master Oct 17, 2022
@bkmgit bkmgit deleted the ARROW-18069 branch October 18, 2022 06:02
kou added a commit that referenced this pull request Oct 20, 2022
This ensures commits are not lost unintentionally, see  
https://itnext.io/git-force-vs-force-with-lease-9d0e753e8c41

Lead-authored-by: Benson Muite <bkmgit@users.noreply.github.com>
Co-authored-by: Antoine Pitrou <pitrou@free.fr>
Co-authored-by: Sutou Kouhei <kou@cozmixng.org>
Signed-off-by: Antoine Pitrou <antoine@python.org>
@ursabot
Copy link

ursabot commented Oct 27, 2022

Benchmark runs are scheduled for baseline = b7e60c7 and contender = 2f17b54. 2f17b54 is a master commit associated with this PR. Results will be available as each benchmark for each run completes.
Conbench compare runs links:
[Finished ⬇️0.0% ⬆️0.0%] ec2-t3-xlarge-us-east-2
[Failed ⬇️0.0% ⬆️0.0%] test-mac-arm
[Finished ⬇️0.0% ⬆️0.0%] ursa-i9-9960x
[Failed] ursa-thinkcentre-m75q
Buildkite builds:
[Finished] 2f17b546 ec2-t3-xlarge-us-east-2
[Failed] 2f17b546 test-mac-arm
[Finished] 2f17b546 ursa-i9-9960x
[Failed] 2f17b546 ursa-thinkcentre-m75q
[Finished] b7e60c75 ec2-t3-xlarge-us-east-2
[Failed] b7e60c75 test-mac-arm
[Finished] b7e60c75 ursa-i9-9960x
[Failed] b7e60c75 ursa-thinkcentre-m75q
Supported benchmarks:
ec2-t3-xlarge-us-east-2: Supported benchmark langs: Python, R. Runs only benchmarks with cloud = True
test-mac-arm: Supported benchmark langs: C++, Python, R
ursa-i9-9960x: Supported benchmark langs: Python, R, JavaScript
ursa-thinkcentre-m75q: Supported benchmark langs: C++, Java

@ursabot
Copy link

ursabot commented Oct 27, 2022

['Python', 'R'] benchmarks have high level of regressions.
test-mac-arm

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants