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

Conflicts on CMakeLists #35

Merged
merged 1 commit into from
Dec 5, 2024
Merged

Conflicts on CMakeLists #35

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
11 changes: 11 additions & 0 deletions .github/workflows/sync_cmakebuild.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,17 @@ jobs:
mainsha=$(git rev-parse HEAD)
git checkout cmakebuild
prevsha=$(git rev-parse HEAD)

conflicts_file=$(mktemp)
git merge main --no-commit --no-ff main | true > $conflicts_file
git reset HEAD --hard
if [ -s $conflicts_file ];then
echo Conflicts detected, trying to remove referenced CMakeLists* files
grep -E -o '\s\S*CMakeLists\S*\s' $conflicts_file | xargs rm
git add .
git commit -m "Remove conflicted CMakeLists"
fi

git merge main --no-edit
currsha=$(git rev-parse HEAD)
if [ ${prevsha} == ${currsha} ];then
Expand Down
Loading