-
-
Notifications
You must be signed in to change notification settings - Fork 92
Add optional reply-to support to tag command #332
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
Add optional reply-to support to tag command #332
Conversation
application/src/main/java/org/togetherjava/tjbot/commands/tags/TagCommand.java
Outdated
Show resolved
Hide resolved
application/src/main/java/org/togetherjava/tjbot/commands/tags/TagCommand.java
Outdated
Show resolved
Hide resolved
application/src/main/java/org/togetherjava/tjbot/commands/tags/TagCommand.java
Outdated
Show resolved
Hide resolved
application/src/main/java/org/togetherjava/tjbot/commands/tags/TagCommand.java
Outdated
Show resolved
Hide resolved
application/src/main/java/org/togetherjava/tjbot/commands/tags/TagCommand.java
Outdated
Show resolved
Hide resolved
application/src/main/java/org/togetherjava/tjbot/commands/tags/TagCommand.java
Outdated
Show resolved
Hide resolved
application/src/main/java/org/togetherjava/tjbot/commands/tags/TagCommand.java
Outdated
Show resolved
Hide resolved
application/src/main/java/org/togetherjava/tjbot/commands/tags/TagCommand.java
Outdated
Show resolved
Hide resolved
Could someone explain to me why we can't use
|
This cant be merged with the current git history. For some reason it has commits in it that shouldnt belong in here (for example a commit by Yusuf adding the warn command). Please rebase on develop and clean up your history so that it only has the changes that you actually made in this PR and nothing else. In the worst case, just reset-mixed and then create a new commit with the now-reset changes. |
The problem started when I pulled all the changes from my fork and rebased the origin developer branch. I wanted to resolve the merge conflict 2 days ago and when i pulled all those changes, i forgot that it pulled it to my feature/command-reply user branch and commited it. Yesterday I tried with @Tais993 to roleback commits since i pushed all those changes, and it didn't sadly work. |
f37302f
to
b0a6578
Compare
application/src/main/java/org/togetherjava/tjbot/commands/tags/TagCommand.java
Outdated
Show resolved
Hide resolved
application/src/main/java/org/togetherjava/tjbot/commands/tags/TagCommand.java
Outdated
Show resolved
Hide resolved
application/src/main/java/org/togetherjava/tjbot/commands/tags/TagCommand.java
Outdated
Show resolved
Hide resolved
Adding the reply-to command
2aedca4
to
ed7d97e
Compare
Adds the optional support to
/tag
to reply-to users, they will then be mentioned:This implements and closes #276 .