Improve pull request command line instructions #27778
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Show checkout instructions also when there is no permission to push, for anyone who wants to locally test the changes. * First checkout the branch exactly as is, without immediately having to solve merge conflicts. Leave this to the merge step, since it's often convenient to test a change without worrying about this. * Use git fetch -u, so an existing local branch is updated when re-testing the same pull request (but not the more risky -f in to handle force pushes). * Show different merge command depending on the chosen merge style.
GiteaBot
added
the
lgtm/need 2
pull-request-size
bot
added
the
size/M
|
Logged out or no ability to merge. Squash merge instructions now using |
delvh
approved these changes
Oct 24, 2023
GiteaBot
added
lgtm/need 1
wxiaoguang
reviewed
Oct 25, 2023
wxiaoguang
reviewed
Oct 25, 2023
wxiaoguang
approved these changes
Oct 25, 2023
GiteaBot
added
lgtm/done
lunny
added
the
reviewed/wait-merge
GiteaBot
removed
the
reviewed/wait-merge
zjjhot
added a commit
to zjjhot/gitea
that referenced
this pull request
Oct 26, 2023
* giteaofficial/main: Add link to members and repositories at teams page (go-gitea#27744) Add dedicated class for empty placeholders (go-gitea#27788) Close all hashed buffers (go-gitea#27787) Fix typo when updating email address (go-gitea#27789) Improve pull request command line instructions (go-gitea#27778)
|
@brechtvl Is this change applied in Blender Gitea or is still pending? |
|
The Blender Gitea has not yet been updated to include this. Probably this or next week. (If you have further questions let's talk on Blender Chat.) |
fuxiaohei
pushed a commit
to fuxiaohei/gitea
that referenced
this pull request
Jan 17, 2024
* Show checkout instructions also when there is no permission to push, for anyone who wants to locally test the changes. * First checkout the branch exactly as is, without immediately having to solve merge conflicts. Leave this to the merge step, since it's often convenient to test a change without worrying about this. * Use `git fetch -u`, so an existing local branch is updated when re-testing the same pull request. But not the more risky `git fetch -f` in to handle force pushes, as we don't want to accidentally overwrite important local changes. * Show different merge command depending on the chosen merge style, interactively updated.
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
git fetch -u, so an existing local branch is updated when re-testing the same pull request. But not the more riskygit fetch -fin to handle force pushes, as we don't want to accidentally overwrite important local changes.