How do the 'Pull into Current using Merge' vs 'Merge selected into Current' context menu commands differ?
Answered
I'm using git for vcs, when I have a branch checked out and I open the branches window and select the origin/master remote branch I get the options to "Merge selected into Current" and 'Pull into Current using Merge' in the menu ( see below).
The Pull menu item only shows when I have a remote branch selected. What do each of these commands do? i.e. what is the difference? What should I used to merge down the latest from remote master to my branch.
Please sign in to leave a comment.
Here the "change" of names and their explanation by Dmitriy Smirnov.
https://youtrack.jetbrains.com/issue/IDEA-266647
Here is some information:
https://www.jetbrains.com/help/idea/apply-changes-from-one-branch-to-another.html#rebase-branch
You can request more information if needed and expect the JetBrains team to provide you with that information.
I got it what Dmitriy Smirnov said. But I would like to know what is the best solution between "Merge into Current" and “Pull into Current Using Merge”.
I think that would be "Pull into Current Using Merge". Is correct?
Technically yes, as you would be getting the latest state from the server. However, it still depends on what you are trying to achieve.
Thank you so much Dino Letic!
Helped me a lot!