IntelliJ : How to put a GIT branch as the new master?

Question

How can I promote a branch called "Crashalytics3" to be the master branch? See the picture for the situation.

The master (origin/master) contains only a few files, while the branch Crashalytics3 contains many files.

I tried:

• Checkout of the master (origin) branch
• Selected the Crashalytics3 branch with "MERGE". It should merge this branch into the master branch.

The message is: "Already up to date". The master branch still contains 2 files.

Answer 1

After many tries, I finally managed to promote the branch as the master.

Step 1: I created a new branch based on the right branch. I made a minor change - I don't know if this forced the new branch into being ;-)

Step 2: Then I did:

git checkout new_branch

git merge --strategy=ours master

git checkout master

git merge new_branch

A final push of the master made the changes final.