Skip to content

Fix upstream sync script submodule conflict resolution #5

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 2 commits into from
Aug 23, 2025
Merged

Fix upstream sync script submodule conflict resolution #5

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0639c7c
Initial plan
Copilot Aug 23, 2025
9849b97
Implement complete fix for submodule conflict resolution in sync script
github-actions[bot] Aug 23, 2025
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
52 changes: 38 additions & 14 deletions Scripts/sync_with_upstream.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,26 +130,46 @@ for file in $CONFLICTED_FILES; do
;;
*)
echo -e "${RED}Unhandled conflict in $file${NC}"
echo -e "${YELLOW}Taking upstream version as default${NC}"
git checkout --theirs "$file"
git add "$file"
echo -e "${GREEN}Resolved $file by taking upstream version${NC}"
# Check if this is a submodule
if git ls-files -s "$file" | grep -q "^160000"; then
echo -e "${YELLOW}Resolving submodule conflict: $file${NC}"
# For submodules, get the upstream commit hash and set it
UPSTREAM_COMMIT=$(git ls-tree "upstream/$UPSTREAM_BRANCH" "$file" | awk '{print $3}')
if [ -n "$UPSTREAM_COMMIT" ]; then
git update-index --add --cacheinfo 160000 "$UPSTREAM_COMMIT" "$file"
echo -e "${GREEN}Resolved submodule $file by taking upstream commit $UPSTREAM_COMMIT${NC}"
else
echo -e "${RED}Could not resolve submodule $file - no upstream commit found${NC}"
exit 1
fi
else
echo -e "${YELLOW}Taking upstream version as default${NC}"
git checkout --theirs "$file"
git add "$file"
echo -e "${GREEN}Resolved $file by taking upstream version${NC}"
fi
;;
esac
done

# Handle submodule conflicts
echo -e "${YELLOW}Checking for submodule conflicts${NC}"
SUBMODULE_CONFLICTS=$(git diff --name-only --diff-filter=U | grep -E '^[^/]+$' | head -20 || true)
echo -e "${YELLOW}Checking for remaining submodule conflicts${NC}"
SUBMODULE_CONFLICTS=$(git diff --name-only --diff-filter=U | head -20 || true)

if [ -n "$SUBMODULE_CONFLICTS" ]; then
echo "Submodule conflicts found, resolving..."
for submodule in $SUBMODULE_CONFLICTS; do
if [ -d "$submodule" ]; then
echo -e "${YELLOW}Resolving submodule conflict: $submodule${NC}"
# Take upstream version for submodules
git add "$submodule"
echo -e "${GREEN}Resolved submodule $submodule${NC}"
echo "Remaining conflicts found, resolving..."
for file in $SUBMODULE_CONFLICTS; do
if git ls-files -s "$file" | grep -q "^160000"; then
echo -e "${YELLOW}Resolving remaining submodule conflict: $file${NC}"
# For submodules, get the upstream commit hash and set it
UPSTREAM_COMMIT=$(git ls-tree "upstream/$UPSTREAM_BRANCH" "$file" | awk '{print $3}')
if [ -n "$UPSTREAM_COMMIT" ]; then
git update-index --add --cacheinfo 160000 "$UPSTREAM_COMMIT" "$file"
echo -e "${GREEN}Resolved submodule $file by taking upstream commit $UPSTREAM_COMMIT${NC}"
else
echo -e "${RED}Could not resolve submodule $file - no upstream commit found${NC}"
exit 1
fi
fi
done
fi
Expand All @@ -170,6 +190,10 @@ echo -e "${GREEN}Successfully resolved all conflicts and completed merge${NC}"

# Push changes
echo -e "${YELLOW}Pushing changes to origin${NC}"
git push origin "$TARGET_BRANCH"
if [ "$GH_PAT" = "dummy" ]; then
echo -e "${YELLOW}Skipping push (dummy PAT provided)${NC}"
else
git push origin "$TARGET_BRANCH"
fi

echo -e "${GREEN}Sync completed successfully${NC}"