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.

Sign up for GitHub

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

Jump to bottom

Merging a Commit that does not have Smalltalk Code #967

Closed
tesonep opened this issue Aug 10, 2018 · 0 comments
Closed

Merging a Commit that does not have Smalltalk Code #967

tesonep opened this issue Aug 10, 2018 · 0 comments
Assignees
@tesonep
Labels
bug merge
Milestone
1.2.2

Comments

@tesonep
Copy link
Collaborator

tesonep commented Aug 10, 2018

When there is need of creating a merge commit and the incoming commit does not include changes in Smalltalk code the commit is not created, a "Nothing to commit" message is shown and the working copy stays in "In Merge" state (having two reference commits)
@tesonep tesonep mentioned this issue Aug 10, 2018
Merged
@tesonep tesonep added the review label Aug 10, 2018
@tesonep tesonep self-assigned this Aug 10, 2018
@guillep guillep removed the review label Aug 11, 2018
@guillep guillep added this to the 1.2.2 milestone Aug 13, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@tesonep tesonep

Labels
bug merge
Projects
None yet
Milestone
1.2.2
Development

No branches or pull requests
2 participants
@tesonep @guillep