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

Fixed replying to comments doesn't move the comment reply form #343

Merged
merged 1 commit into from
Nov 5, 2018
Merged

Fixed replying to comments doesn't move the comment reply form #343

merged 1 commit into from
Nov 5, 2018

Conversation

Tsquare17
Copy link
Member

No description provided.

@christophherr
Copy link
Member

Hi @Tsquare17,
could you please resolve the merge conflict? (Not anybody's fault. It just happens sometimes when different PRs make changes to neighbouring or identical code lines.)
You can either rebase develop and force push your branch or merge develop and push your branch.

@Tsquare17 Tsquare17 force-pushed the replying-to-comments-doesnt-move-the-comment-reply-form branch 3 times, most recently from 5b092ae to f1a5a8c Compare October 18, 2018 20:31
@Tsquare17 Tsquare17 force-pushed the replying-to-comments-doesnt-move-the-comment-reply-form branch from 63063c4 to ee84da3 Compare October 31, 2018 00:42
christophherr
christophherr approved these changes Nov 5, 2018
View reviewed changes
Copy link
Member

@christophherr christophherr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for contributing to Beans, @Tsquare17!

@christophherr christophherr merged commit 8993234 into Getbeans:development Nov 5, 2018
@christophherr christophherr mentioned this pull request Nov 5, 2018
Closed
@Tsquare17 Tsquare17 deleted the replying-to-comments-doesnt-move-the-comment-reply-form branch November 5, 2018 01:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@christophherr christophherr christophherr approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@Tsquare17 @christophherr