#!/bin/bash
# Check the PR status and whether there are merge conflicts
gh pr view 1450 --json mergeable,mergeStateStatus,state,baseRefName,headRefName

# Get the PR details including files changed
gh pr view 1450 --json files --jq '.files[] | {path: .path, additions: .additions, deletions: .deletions}'

# Check if there are any conflicts by looking at the merge status
gh pr view 1450 --json statusCheckRollup --jq '.statusCheckRollup[]'

#!/bin/bash
# Try to get more information about the conflicts
# First, let's see the current state of the base branch
git fetch origin tail-encoding

# Show the files that would conflict
git diff --name-only origin/tail-encoding...origin/coderabbitai/docstrings/c1f15c5

# Check if we can get merge conflict details
git merge-tree $(git merge-base origin/tail-encoding origin/coderabbitai/docstrings/c1f15c5) origin/tail-encoding origin/coderabbitai/docstrings/c1f15c5 | head -100

#!/bin/bash
# Let's check the current branches and get conflict information differently
git branch -a | grep -E "(tail-encoding|coderabbitai)"

# Fetch the PR branch
git fetch origin pull/1450/head:pr-1450

# Try to merge and see what conflicts
git checkout tail-encoding
git merge --no-commit --no-ff pr-1450 2>&1 || true

# Show which files have conflicts
git diff --name-only --diff-filter=U

# Show the actual conflicts
git diff --diff-filter=U

#!/bin/bash
# Check current branch and available branches
git branch -a

# Fetch all branches
git fetch origin

# List remote branches
git ls-remote --heads origin | grep -E "(tail-encoding|coderabbitai)"

# Try to checkout the base branch
git checkout -b tail-encoding origin/tail-encoding 2>&1 || git checkout tail-encoding

# Show current status
git status

# Now try to merge the PR branch
git merge --no-commit --no-ff pr-1450 2>&1 || true

# Show conflicting files
git diff --name-only --diff-filter=U 2>&1 || echo "No conflicts detected in diff"

# Show status again
git status

#!/bin/bash
# Fetch specific branches
git fetch origin tail-encoding:tail-encoding
git fetch origin coderabbitai/docstrings/c1f15c5:coderabbitai-branch

# Checkout the base branch
git checkout tail-encoding

# Try to merge the PR branch
git merge --no-commit --no-ff coderabbitai-branch 2>&1 || true

# Check for conflicts
if git diff --name-only --diff-filter=U | grep -q .; then
    echo "=== CONFLICTING FILES ==="
    git diff --name-only --diff-filter=U
    echo ""
    echo "=== CONFLICT DETAILS ==="
    git diff --diff-filter=U
else
    echo "No conflicts found"
    git status
fi

#!/bin/bash
# Set up git config
git config user.email "bot@coderabbit.ai"
git config user.name "CodeRabbit"

# Try the merge again
git merge --no-commit --no-ff coderabbitai-branch 2>&1 || true

# Check for conflicts
if git diff --name-only --diff-filter=U 2>/dev/null | grep -q .; then
    echo "=== CONFLICTING FILES ==="
    git diff --name-only --diff-filter=U
    echo ""
    echo "=== CONFLICT DETAILS ==="
    git diff --diff-filter=U | head -200
else
    echo "=== NO CONFLICTS IN DIFF ==="
    git status
    echo ""
    echo "=== Checking merge status ==="
    git ls-files -u 2>&1 || echo "No unmerged files"
fi

# Show what changed between the branches
echo ""
echo "=== FILES CHANGED IN PR BRANCH ==="
git diff --name-status tail-encoding...coderabbitai-branch