Skip to content

remove --3way and add pauses #414

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

Merged
merged 1 commit into from
Jun 26, 2025
Merged

remove --3way and add pauses #414

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 7 additions & 2 deletions release.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,19 @@ update_follower () {
echo; echo "🔄 Updating $DIR …"
cd "$DIR"

echo; echo "If there are custom changes needed to the patch, make the change before continuing"
pause

# 1 · Make sure we’re on a clean, up-to-date main
echo_run git switch "$MAIN_BRANCH"
echo_run git fetch
echo_run git pull

# 2 · Apply the patch with 3-way fallback
if ! git apply --3way --whitespace=nowarn "$PATCH_FILE"; then
# 2 · Apply the patch. Do not use 3way because commit history is not in common
if ! git apply --whitespace=nowarn "$PATCH_FILE"; then
echo "‼️ Some hunks could not be merged automatically."
echo; echo "Use a different terminal to fix files before continuing"
pause
fi

# 3 · Pause if any conflict markers remain
Expand Down