My Business Case –

We are 3 Testers working on a Common Code base stored in Main branch.

Last week I started working on a new test by creating a feature branch from Main.
However before I could create a PR, the other 2 testers pushed their changes and got merged into Main branch.

now my problem is that my feature branch is not in sync with main branch.
how do I pull the latest changes into feature from main.

Git fetch or Git pull didnt update my feature branch, it only updated my local main branch
but my local feature branch is still not updated with latest changes from main.

How do I rebase my local feature branch with latest copy of main branch in INTELLIJ IDea Ultimate.

I get confused when selecting ACCEPT MY CHANGE or ACCEPT THEIR CHANGE.
I messed up my branch while doing that ….

How do I update my feature branch from latest copy of master without losing my local changes

Please guide me