Projects >> limited-wip >>5506bb7afbc7df52ffb95f28455eb2f92db157ea

Chunk
Conflicting content 
	@Override public void initComponent() {
		Settings settings = ServiceManager.getService(Settings.class);
<<<<<<< HEAD:src/ru/autorevert/components/AutoRevertAppComponent.java
		notifyAutorevertComponentsAbout(settings);

		ApplicationManager.getApplication().invokeLater(new Runnable() {
			@Override public void run() {
				new Notification(
						AutoRevertAppComponent.DISPLAY_NAME,
						"Auto-revert plugin is deprecated",
						"Please use Limited WIP plugin instead",
						NotificationType.ERROR
				).notify(null);
			}
		});
=======
		notifyComponentsAbout(settings);
>>>>>>> f4b6e4baf71e0bb4054898bda0f94c6973281373:src/limitedwip/components/LimitedWIPAppComponent.java
	}

	@Override public void disposeComponent() {
Solution content 
	@Override public void initComponent() {
		Settings settings = ServiceManager.getService(Settings.class);
		notifyAutorevertComponentsAbout(settings);

		ApplicationManager.getApplication().invokeLater(new Runnable() {
			@Override public void run() {
				new Notification(
						AutoRevertAppComponent.DISPLAY_NAME,
						"Auto-revert plugin is deprecated",
						"Please use Limited WIP plugin instead",
						NotificationType.ERROR
				).notify(null);
			}
		});
	}

	@Override public void disposeComponent() {
File
LimitedWIPAppComponent.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Chunk
Conflicting content 
						new ArrayList(defaultChangeList.getChanges()),
						"",
						commitMessage,
<<<<<<< HEAD:src/ru/autorevert/components/QuickCommitAction.java
						noCheckinHandlers, true, true, FunctionUtil.nullConstant(), null
=======
						noCheckinHandlers, true, true, FunctionUtil.nullConstant(),
						new CommitResultHandler() {
							@Override public void onSuccess(@NotNull String commitMessage) {}
							@Override public void onFailure() {}
						}
>>>>>>> f4b6e4baf71e0bb4054898bda0f94c6973281373:src/limitedwip/ui/QuickCommitAction.java
				);

				boolean committed = commitHelper.doCommit();
Solution content 
						new ArrayList(defaultChangeList.getChanges()),
						"",
						commitMessage,
						noCheckinHandlers, true, true, FunctionUtil.nullConstant(), null
				);

				boolean committed = commitHelper.doCommit();
File
QuickCommitAction.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Variable