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.

Sign up for GitHub

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

mrg() Ensure to checkout to main_branch #18

Merged
merged 2 commits into from
May 6, 2022
Merged

mrg() Ensure to checkout to main_branch #18

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
abe4531
mrg() Ensure to checkout to main_branch
pascalandy May 6, 2022
d85518d
mrg() Ensure to checkout to main_branch
pascalandy May 6, 2022
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
24 changes: 22 additions & 2 deletions bashlava.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,10 @@
Impact on: #4, #8, #9 #10, #11


# TODO pr(), mrg() remove prompt that ask if I want to see ci()
Impact on: #4, #10
# TODO mrg() Ensure to checkout to main_branch

The user maybe did not deleted the PR branch in the previous step (via cli gh pr merge)
Impact on: #4, #9, #10

# TODO dummy commits
create a dummy commit as test quickly the whole workflow
Expand Down Expand Up @@ -236,8 +238,26 @@ function mrg { # User_

gh pr merge

echo "wip" > /dev/null 2>&1

# Ensure to checkout to main_branch.
# The user maybe did not deleted the PR branch in the previous step (via cli gh pr merge)
_branch_exist=$(git branch --list "${default_branch}" | wc -l)
# It does not make sens to Condition_Vars_Must_Be_Not_Empty
if [[ ${_branch_exist} -eq 0 ]]; then
echo "OK we are on main_branch. Nothing to do"
elif [[ ${_branch_exist} -eq 1 ]]; then
echo "We are not on main_branch. Lets checkout"
mainbranch
else
my_message="FATAL: ${_branch_dev_unique} (local)" && Print_Fatal
fi

Show_Version

my_message="Current branch is:" && Print_Blue
git rev-parse --abbrev-ref HEAD

_doc_name="next_move_fct_mrg.md" && Show_Docs
input_2="not_set" #reset input_2
read -r user_input;
Expand Down