Feature Suggestion: Add the ability to overwrite local changes when pulling from a remote source in PHPStorm
As the title says.
I am a student and now more than ever, due to the global COVID-19 pandemic, I am forced to use shared git repositories with my lecturers.
I know this isn't necessarily standard workflow, but I usually keep track of any code changes locally, then after the lesson, I pull any code that I couldn't be bothered to write down or that I've missed.
Due to the way PHPStorm handles git pulls at the moment, an error is thrown every time I try to pull anything from a remote while there still being any local changes present, prompting one to either merge, commit, stash or revert.
Therefore I propose to add a checkbox to the "Pull Changes" dialogue which would enable the user to automatically "overwrite local changes".. To counteract accidental overwriting of local changes, I think some form of warning dialogue should be triggered upon using this feature. Maybe a one time speech bubble could appear next to the "overwrite local changes" checkbox upon clicking it for the first time, or a warning message could display in the event log, explaining that, if continuing with the pull request, local changes will be lost. In any case however, I think the ability to "always automatically overwrite local changes upon conflict" should be given.
I think this would benefit a lot of users in that that it would speed up the pull process a bit.
I would like to add though that I've only been using PHPStorm for roughly a year now and I am not 100% familiar with all the facets of either PHPStorm and the git protocol. Therefore; if this functionality already exists in some form, I apologize for the redundant thread in advance :)
In any case, thanks for reading through my suggestion.
Please sign in to leave a comment.
@... Please submit this to our tracker at https://youtrack.jetbrains.com/newIssue. Developers aren't monitoring forums unfortunately