Git Extender adds an option to
local branches tracking a remote for all git roots in the current project
Local branches that will be updated are the branches that exist locally and have been configured to track a remote branch.
It requires IDE version 2016.3 or higher and Java 8
It tries to fast-forward commits in remote branches to local branches. It can be configured through the settings to attempt a simple merge, if the local branch cannot be merged to the tracked remote using fast-forward only. In this case, if there are conflict errors, the merge will be aborted and an error notification will be shown. The update, then, should be performed manually for the reported branch, in order to resolve the conflicts. Any possible uncommitted changes to the current branch will be stashed
After updating a branch, if there were any file changes, they will be displayed in IntelliJ Version Control tab. Currently, the correct list of file changes (updated, created, removed) will be displayed. However, when performing a diff for files in a branch other than the currently checked out, the diff will most probably be incorrect.
This plugin is available under
Apache License, Version 2.0
Recent change notes
Fix issue #8: create UpdateInfoTree in the event dispatch thread