Git on Visual Studio is so dumb

I wanted to do a Pull Request, and when I checked the request, a conflict prevented from auto-merging and ask to resolve it in Visual Studio.

"What conflitct ?" I asked.

"You're on your own, fam" Visual Studio answered.

Real sweet.

So today I was having this discussion with my colleague regarding a messed up pull request.

Me: are you done merging the remaining branches into master?
Colleague: no, I'm still merging the changes manually.
Me: but why?
Colleague: because the changes will overwrite the changes in master.
Me: but how? It will just conflict and you can keep whichever changes YOU WANT. You can even edit before committing the merge.
Colleague: I'm just redoing the changes manually anyway.
Me: -_-

They should merge my pr first, so the one who will resolve the conflict is not me. I spent 3 days and nights cleaning 60 files in the projects. 60 files! Sadly, my manager merged other pr with 2 files changes from my junior first, destroying many of my changes.

Can you imagine this scary moment while resolving conflict after a pull request that might break your code ?

That's the scariest moment

Have a question about git rebase with android studio.

So I have a feature branch which I finished working on, I made a pull request to develop branch and now I see many conflicts because develop is few commits ahead.

In android studio I switched to my feature branch, then did a git rebase develop and resolved all conflicts. After conflicted files were fixed I did a git add conflicted_file and continued with git rebase --continue until the end.

Now everything is finished. I have a local feature branch that was rebased to current develop, and I resolved all conflicts.

Problem is when I do a git push to my remote feature branch, I get a merge conflict error conflict from android studio and now I have to solve all merge conflicts yet again for some reason.

What I am doing wrong?

So here's a question.
IF i have a developmentbranch that i'm working on an notice a merge conflict in my pull-request. I do a rebase on to origin/master. Then... I have to make pullforward or force push. Which one is more natural to do?