Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Debugger if we try to merge without selecting a branch #1036

Closed
jecisc opened this issue Oct 21, 2018 · 0 comments
Closed

Debugger if we try to merge without selecting a branch #1036

jecisc opened this issue Oct 21, 2018 · 0 comments
Labels
Milestone

Comments

@jecisc
Copy link
Contributor

jecisc commented Oct 21, 2018

Since my project was in Detached Head state, I tried to use the "Merge" repair option. This opens a dialogue asking you to select a branch to merge with.

Since the current branch is in bold, I thought that maybe it was selected by default. I tried to click on "OK" but then I got an error.

UndefinedObject(Object)>>doesNotUnderstand: #name
IceTipMergeBranchPanel>>doAccept
IceTipMergeBranchDialog>>doAccept
[ self doAccept.
true ] in IceTipMergeBranchDialog(IceTipOptionDialog)>>accept in Block: [ self doAccept....
BlockClosure>>on:do:
IceTipMergeBranchDialog(IceTipOptionDialog)>>accept
[ self accept ] in IceTipMergeBranchDialog(IceTipDialog)>>openDialogWithSpec in Block: [ self accept ]
[ okAction value value == false
	ifFalse: [ owner ifNil: [ self delete ] ifNotNil: [ owner delete ] ] ] in OkCancelToolbar(OkToolbar)>>okActionBlock in Block: [ okAction value value == false...
ButtonPresenter>>performAction
@guillep guillep added this to the 1.3 milestone Oct 30, 2018
jecisc added a commit to jecisc/iceberg that referenced this issue Oct 31, 2018
- Do no throw a MNU if there is no selected branch
- Select a branch by default if there is one present (either the head of the first one)

Fixes pharo-vcs#1036
@guillep guillep closed this as completed Nov 1, 2018
@guillep guillep removed the review label Nov 1, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

No branches or pull requests

3 participants