adamsaghy commented on PR #4623: URL: https://github.com/apache/fineract/pull/4623#issuecomment-2930100273
There is no such things as phantom conflicts.. The recommended way is to always rebase. However what you tried to do was to rebase the local develop branch, however if you havent pulled the latest changes of develop branch from the remote, it will not do much things, so let me advise 2 options what you can do: Option 1: - `git checkout develop` -> Switch to `develop` branch - `git pull` -> Pull latest changes from remote to local `develop` branch - `git checkout external-id-management` -> Switch to your feature branch - `git rebase develop` -> Start rebasing -> Fix conflicts - `git rebase --continue` -> Finish on Rebasing Option 2: - `git fetch origin` -> Fetch latest branches from `origin` (if `origin` points to `apache/fineract` repository) - `git rebase origin/develop` -> Start rebasing -> Fix conflicts - `git rebase --continue` -> Finish on Rebasing -- 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]
