git delete branch with uncommitted changes

P圜harm lets you undo selected changes from a pushed commit if this commit contains multiple files and you only need to revert some of them. If the selected commit contains several files, and you only need to revert some of them, deselect the files you do not want to touch.Ĭlick Commit to commit a changeset that reverts the changes to the selected files in this particular commit. If you apply this action to multiple commits selected in the Log view, a separate commit will be created to revert each of them. The Commit Changes dialog will open with an automatically generated commit message. This option is also available from the context menu of a commit in the file History view.

Locate the commit you want to revert in the Log tab of the Git tool window Alt+9, right-click it and select Revert Commit from the context menu. Thus, the project history is preserved, as the original commit remains intact. This operation results in a new commit that reverses the effect of the commit you want to undo. If you notice an error in a specific commit that has already been pushed, you can revert that commit. Select the Track context option if you want P圜harm to remember your context and reload currently opened files in the editor when this changelist becomes active. Select the Set active option if you want to make the changelist with the changes you are about to discard the active changelist. You can either select an existing changelist from the Name list, or specify the name of a new changelist (the commit message is used by default). In the dialog that opens, select a changelist where the changes you are going to discard will be moved. Select the last commit in the current branch and choose Undo Commit from the context menu. Open the Git tool window Alt+9 and switch to the Log tab. You cannot undo a commit if it was pushed to a protected branch, that is a branch to which force -push is not allowed (configure protected branches in the Version Control | Git page of the IDE settings Control+Alt+S) Note that if a branch is marked as protected on GitHub, P圜harm will automatically mark it as protected when you check it out. P圜harm allows you to undo the last commit in the current branch. You can change this behavior in Settings | Version Control | Confirmation using When files are created and When files are deleted settings respectively. If you are more used to the staging concept, select the Enable staging area option in the Version Control | Git page of the IDE settings Control+Alt+S.Īlso, by default P圜harm suggests adding each newly created file under version control. Remove it from the commit: do not select it in the Changes area of the Commit tool window.

If a file is already under version control, and you do not want to commit it, you can: Unstage filesīy default, P圜harm uses the changelists concept where modified files are staged automatically. In the Commit tool window Alt+0, select one or more files that you want to revert, and select Rollback from the context menu, or press Control+Alt+Z.Īll changes made to the selected files since the last commit will be discarded, and they will disappear from the active changelist. You can always undo the changes you've made locally before you commit them:

Git delete branch with uncommitted changes