IntelliJ 2021.1 Why does it seem like Git rebase does a merge?

Answered

I used to be on IntelliJ 2019 enterprise edition until recently. And this was what I used to do in IntelliJ 2019 when I had a branch x which needs to be rebased on to master.

- checkout master locally

- update it from remote

- then select my branch in the branch selector at the bottom right and 'checkout and rebase onto current'

What this did was it transplanted all the commits in my local branch and put it at the forefront making all the commits in my branch seem as if they were made after all the master branch's commits.

Now, I updated to IntelliJ 2021.1 recently. And when I do the same rebase it does a MERGE and worst of all, it makes it seem as if all the commits from master were made by ME. It is EXTREMELY infuriating. Why was this changed? Why was such a great functionality destroyed?

Or please explain what I am doing wrong.

0
2 comments

Hello Nikhilvan10

'checkout and rebase onto current' has not been changed and the behavior should be the same across all versions.

0

I changed Update Method to 'Rebase' in Preferences -> Version Control -> Git. I think that resolved my issue because I don't see it any more.

0

Please sign in to leave a comment.