Dmitriy Smirnov

Follow New articles and posts New articles, posts, and comments

Nikhil Ranka you should be able to call Local Histroy on the .idea/shelf directory to restore the chanegs. Or maybe the patches are there, but for some reasons changes are not listed in Shelf tab

1. Community
2. IntelliJ IDEA Users
3. Lost Shelf

• 1 vote

> Thing is I would prefer to resolve merge conflict in a way similar to classic git merge You can do it directly in the editor, in the classic git way. IDE could better support this scenario and th...

1. Community
2. IntelliJ IDEA Users
3. Please help to understand how git merge works in IDEA.

• 0 votes

Currently, there is a concept of Common branches. If a branch exists in ALL repositories in the project, then it is possible to run a command against this branch in all repositories at once. To do ...

1. Community
2. CLion
3. Project with multiple git repos

• 0 votes

The central panel helps to show what changes the branches introduced. It allows not only to compare two states but also to see what was changed in the branches to better understand the change, and ...

1. Community
2. IntelliJ IDEA Users
3. Please help to understand how git merge works in IDEA.

• 0 votes

This is currently not possible to control only some of several repositories in the project. Here is a somewhat similar request https://youtrack.jetbrains.com/issue/IDEA-177729, please vote.

1. Community
2. IntelliJ IDEA Users
3. 'Show Diff With Working Tree' for multiple repos at once

• 0 votes

Could you please elaborate why the existing Console tab in the Git toolwindow doesn't to work? It actually collapses the configuration part (all -c options) wich makes the commands rather clear

1. Community
2. IntelliJ IDEA Users
3. VCS UI actions to show the simplified runned command

• 0 votes

The solution is to 1. Correct git config - make sure user.name is set correctly. Seems currently a password is set as the user name. Check both global config 2. Rewrite history to change the author...

1. Community
2. PyCharm
3. Clear text password displayed in "author" column

• 0 votes

Basically, that is covered by a general request to show commit https://youtrack.jetbrains.com/issue/IDEA-74250 We will implement it as part of a new All-in-One diff view https://youtrack.jetbrains....

1. Community
2. PhpStorm
3. Show "Commit date" date during Git > Show diff

• 1 vote

"git checkout origin/master" puts the repository to a detached head state, which is usually not the desired state. A local branch is usually handier, so to make it easier, when Checkout is called o...

1. Community
2. IntelliJ IDEA Users
3. Checkout remote git branch without pull

• 0 votes

Note that you can see the full output of hooks in the Console tab of the Git toolwindow

1. Community
2. IntelliJ IDEA Users
3. How to display error messages from commit hooks

• 1 vote