Lymah123 commented on PR #4623:
URL: https://github.com/apache/fineract/pull/4623#issuecomment-2921070830
I'm experiencing an unusual conflict situation with my PR.
GitHub shows conflicts in three files:
```
fineract-provider/build.gradle
fineract-provider/src/main/resources/jpa/persistence.xml
fineract-savings/src/main/resources/jpa/savings/persistence.xml
```
However, my local Git shows no conflicts:
- When I run `git merge develop` → "Already up to date"
- When I run `git rebase develop` → "Current branch is up to date"
- I created a fresh branch from develop and cherry-picked my changes without
conflicts
What I've Tried
1. Force pushing with `--force-with-lease` and `--force`
2. Creating new branches from develop
3. Hard resetting and cherry-picking
4. Creating a clean branch with `conflict-resolution-branch`
- This cherry-picked cleanly with all 22 files
- But GitHub still shows "Can't automatically merge"
What approach would you recommend to resolve these "phantom" conflicts?
--
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]
