From c124c37fc1480ef8309bc674ba5a48c0a91bcfb9 Mon Sep 17 00:00:00 2001 From: Bas Leijdekkers Date: Mon, 19 Mar 2012 16:49:42 +0100 Subject: [PATCH 1/2] remove unnecessary border --- .../src/com/intellij/openapi/diff/ex/DiffStatusBar.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/platform/platform-impl/src/com/intellij/openapi/diff/ex/DiffStatusBar.java b/platform/platform-impl/src/com/intellij/openapi/diff/ex/DiffStatusBar.java index a7379192358e..7f3edab64237 100644 --- a/platform/platform-impl/src/com/intellij/openapi/diff/ex/DiffStatusBar.java +++ b/platform/platform-impl/src/com/intellij/openapi/diff/ex/DiffStatusBar.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2012 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ package com.intellij.openapi.diff.ex; import com.intellij.openapi.editor.colors.EditorColorsManager; import com.intellij.openapi.editor.colors.EditorColorsScheme; -import com.intellij.ui.IdeBorderFactory; import com.intellij.util.ui.UIUtil; import org.jetbrains.annotations.Nullable; @@ -109,8 +108,7 @@ public class DiffStatusBar extends JPanel { } }; setLayout(new BorderLayout()); - setBorder(BorderFactory.createCompoundBorder(IdeBorderFactory.createBorder(), - BorderFactory.createEmptyBorder(3, 20, 3, 20))); + setBorder(BorderFactory.createEmptyBorder(3, 20, 3, 20)); add(myTextLabel, BorderLayout.WEST); Box box = Box.createHorizontalBox(); From 58f279dac7c7a03c6700bcd98d203ed889ed5dd5 Mon Sep 17 00:00:00 2001 From: Kirill Likhodedov Date: Mon, 19 Mar 2012 20:06:54 +0400 Subject: [PATCH 2/2] IDEA-82907 Don't suggest to delete "master" branch after merge --- .../src/git4idea/branch/GitMergeOperation.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/plugins/git4idea/src/git4idea/branch/GitMergeOperation.java b/plugins/git4idea/src/git4idea/branch/GitMergeOperation.java index 72a1c03cba63..468a7f85d17f 100644 --- a/plugins/git4idea/src/git4idea/branch/GitMergeOperation.java +++ b/plugins/git4idea/src/git4idea/branch/GitMergeOperation.java @@ -159,7 +159,7 @@ class GitMergeOperation extends GitBranchOperation { @Override protected void notifySuccess(@NotNull String message) { - if (!myLocalBranch) { + if (isRemoteBranch() || isMasterBranch()) { super.notifySuccess(message); } else { @@ -169,6 +169,14 @@ class GitMergeOperation extends GitBranchOperation { } } + private boolean isMasterBranch() { + return myBranchToMerge.equals("master"); + } + + private boolean isRemoteBranch() { + return !myLocalBranch; + } + private boolean resolveConflicts() { if (!myConflictedRepositories.isEmpty()) { return new MyMergeConflictResolver().merge();