0

When I click update project of IDEA, two options pop up. What's the difference between these two options?

  1. Merge incoming changes into the current branch
  2. Rebase the current branch on top of incoming changes

update project

two options

Rup
  • 33,765
  • 9
  • 83
  • 112
Buger
  • 1
  • 1
  • Does this answer your question? [When do you use Git rebase instead of Git merge?](https://stackoverflow.com/questions/804115/when-do-you-use-git-rebase-instead-of-git-merge) – Abby Mar 29 '23 at 08:37

1 Answers1

0

When you run Update project, essentially, IDE runs a git fetch+git merge OR git fetch+git rebase

You can read more about this here:

https://www.jetbrains.com/help/idea/sync-with-a-remote-repository.html#update

As for Merge and Rebase themselves you can read in official Git documentation

Ruslan Kuleshov
  • 1,934
  • 1
  • 7
  • 11