Skip to content

Commit e9ed00b

Browse files
authored
Apply suggestion from @Phlogistique
1 parent 18b24ab commit e9ed00b

1 file changed

Lines changed: 1 addition & 3 deletions

File tree

update-pr-stack.sh

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,13 +112,11 @@ update_direct_target() {
112112
echo
113113
echo "#### How to resolve"
114114
for i in "${!CONFLICTS[@]}"; do
115+
echo '```bash'
115116
if [[ "$i" -eq 0 ]]; then
116-
echo '```bash'
117117
echo "git fetch origin"
118118
echo "git switch $BRANCH"
119119
echo "git pull origin $BRANCH"
120-
else
121-
echo '```bash'
122120
fi
123121
echo "git merge ${CONFLICTS[$i]}"
124122
echo '```'

0 commit comments

Comments
 (0)