old
/
discord-bot
2
0
Fork 0
Code Issues Pull Requests 2 Projects Releases Wiki Activity

made test suggest command #3

Open
m375chen wants to merge 5 commits from suggestCommand into master
pull from: suggestCommand
merge into: old:master
Conversation 3 Commits 5 Files Changed 3 +77 -3
m375chen commented 2021-05-20 21:00:49 -04:00 (Migrated from git.uwaterloo.ca)
Copy Link
No description provided.
m375chen commented 2021-05-20 21:02:53 -04:00 (Migrated from git.uwaterloo.ca)
Copy Link

added 1 commit

Compare with previous version

added 1 commit <ul><li>60f4c80e - undo settings</li></ul> [Compare with previous version](/csc/discord-bot/-/merge_requests/3/diffs?diff_id=55672&start_sha=5647328ecf23cefc972f740cce0e2e2e63edc260)
m375chen commented 2021-05-20 21:07:34 -04:00 (Migrated from git.uwaterloo.ca)
Copy Link

added 1 commit

Compare with previous version

added 1 commit <ul><li>60ffb916 - undo settings</li></ul> [Compare with previous version](/csc/discord-bot/-/merge_requests/3/diffs?diff_id=55674&start_sha=60f4c80e5dc9bd7ab529800a5509ba89c8dde62a)
m375chen commented 2021-06-03 20:29:44 -04:00 (Migrated from git.uwaterloo.ca)
Copy Link

added 6 commits

Compare with previous version

added 6 commits <ul><li>60ffb916...f50e1ba4 - 4 commits from branch <code>master</code></li><li>b26716f5 - Merge branch &#39;master&#39; of https://git.uwaterloo.ca/csc/discord-bot</li><li>bb9a753a - suggestion created</li></ul> [Compare with previous version](/csc/discord-bot/-/merge_requests/3/diffs?diff_id=58017&start_sha=60ffb916f845e2ba5acbe3596d58691744467dfd)
This pull request has changes conflicting with the target branch.
  • index.ts
repo.pulls.merge_instruction_hint

step1

repo.pulls.merge_instruction_step1_desc
git checkout -b suggestCommand master
git pull origin suggestCommand

step2

repo.pulls.merge_instruction_step2_desc
git checkout master
git merge --no-ff suggestCommand
git push origin master
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels
No items
No Label
Milestone
Clear milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
No Assignees
1 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: old/discord-bot#3
No description provided.
Delete Branch "suggestCommand"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?