Lymah123 commented on PR #4623: URL: https://github.com/apache/fineract/pull/4623#issuecomment-2933244140
The issue wasn't actually "phantom" conflicts , it was a remote repository mismatch: - **Local setup**: My ` origin` remote pointed to my fork `(Lymah123/fineract)` - **GitHub PR**: The PR was targeting the upstream repository `(apache/fineract)` - **Problem**: My local `develop` branch was synced with my fork, but GitHub was comparing against the upstream repository's `develop` branch Why Local Git Showed No Conflicts when I run: ``` git merge develop git rebase develop ``` These commands were comparing against my fork's `develop` branch, which was already compatible with my `feature` branch. The Real Issue: GitHub's conflict detection was comparing my PR branch against upstream's `develop` branch, which had diverged from my fork's `develop` branch. Steps I took to resolved it: - Added upstream remote -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
