void (@NotNull PushUpdateSettings settings, boolean rebaseOverMergeDetected) { UpdateMethod updateMethod = settings.getUpdateMethod(); if (!rebaseOverMergeDetected && // don't overwrite explicit "rebase" with temporary "merge" caused by merge commits mySettings.getUpdateMethod() != updateMethod && mySettings.getUpdateMethod() != UpdateMethod.BRANCH_DEFAULT) { // don't overwrite "branch default" setting mySettings.setUpdateMethod(updateMethod); } }