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

Fix Typos in release.sh and merge_pr.sh Scripts #4087

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions scripts/merge_pr.sh → scripts/A helper to merge e.g. a PR
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
#
# A helper to merge e.g. a PR from draft to an RC branch where any neccessary
# conflicts resolutions are expected to have been trained with rerere.
# A helper to merge e.g. a PR from draft to an RC branch where any necessary
# conflict resolutions are expected to have been trained with rerere.
#
# It merges PRs from "origin" remote which should be set to "[email protected]:anoma/namada.git".
# Make sure to fetch latest before running with e.g. `git fetch origin`.
Expand Down
2 changes: 1 addition & 1 deletion scripts/release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ cargo release version --execute $VERSION
git commit -am "Namada $VERSION"
HASH_AFTER=$(git rev-parse HEAD)

# update the wasm workspace crate versions (1 fixup)
# update the wasm workspace crate versions (1 commit)
cd $REPO_ROOT/wasm
cargo release version --execute $VERSION
cargo update -w
Expand Down
Loading