Merge remote-tracking branch origin/master into gsoc-2023-project
#1489
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
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
The repository appears to be initially created as a shallow clone. We need both branches in order to merge between two branches. Fetch the remote repository with the unshallow option. If that command fails, then fetch the remote repository without the unshallow option. The hope is that one of the two fetch commands will succeed. Configure the user email address and user name in the repository so that the merge does not fail with the message that user name and user email are not configured. The email address is fake, since no email is accepted at the jenkins.io site. Perform the merge with the `--no-edit` command so that merge knows it should not open an editor. May be unnecessary, but should not be harmful.
MarkEWaite
approved these changes
May 29, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Automated changes by create-pull-request GitHub action