| Chunk |
|---|
| Conflicting content |
|---|
.click();
SWTBotShell shell = bot.shell(UIText.GitCloneWizard_title);
shell.bot().tree().select("Clone URI");
<<<<<<< HEAD
=======
>>>>>>> fdc286a3ccf49037c55919f24c87daae4b516392
shell.bot().button("Next >").click(); // for some reason, textWithLabel doesn't seem to work
shell.bot()
.textInGroup(UIText.RepositorySelectionPage_groupLocation, 0) |
| Solution content |
|---|
.click();
SWTBotShell shell = bot.shell(UIText.GitCloneWizard_title);
shell.bot().tree().select("Clone URI");
shell.bot().button("Next >").click(); // for some reason, textWithLabel doesn't seem to work
shell.bot()
.textInGroup(UIText.RepositorySelectionPage_groupLocation, 0) |
| File |
|---|
| GitRepositoriesViewRepoHandlingTest.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Blank |
| Chunk |
|---|
| Conflicting content |
|---|
*/
public void setDefaults() {
if (repository != null)
<<<<<<< HEAD
createChangeId = GerritUtil.getCreateChangeId(repository
.getConfig());
=======
createChangeId = repository.getConfig().getBoolean(
ConfigConstants.CONFIG_GERRIT_SECTION,
ConfigConstants.CONFIG_KEY_CREATECHANGEID, false);
>>>>>>> fdc286a3ccf49037c55919f24c87daae4b516392
signedOff = org.eclipse.egit.ui.Activator.getDefault()
.getPreferenceStore()
.getBoolean(UIPreferences.COMMIT_DIALOG_SIGNED_OFF_BY); |
| Solution content |
|---|
*/
public void setDefaults() {
if (repository != null)
createChangeId = GerritUtil.getCreateChangeId(repository
.getConfig());
signedOff = org.eclipse.egit.ui.Activator.getDefault()
.getPreferenceStore()
.getBoolean(UIPreferences.COMMIT_DIALOG_SIGNED_OFF_BY); |
| File |
|---|
| CommitMessageComponent.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Attribute |
| Method invocation |