• This project
    • Loading...
  • Sign in

임승현 / Multiplex_Ticketing_Platform

%ea%b7%b8%eb%a6%bc1
Go to a project
Toggle navigation Toggle navigation pinning
  • Projects
  • Groups
  • Snippets
  • Help
  • Project
  • Activity
  • Repository
  • Pipelines
  • Graphs
  • Issues 0
  • Merge Requests 0
  • Wiki
  • Snippets
  • Network
  • Create a new issue
  • Builds
  • Commits
  • Issue Boards
Merged
Merge Request !32 opened 2022-06-07 16:00:03 UTC by ShinSeungMin@2021105612

Add KakaoAPI feature and Add refreshing and Fix bug

Edited 2022-06-07 16:06:38 UTC
Request to merge 2021105612:master into feature/Chatbot_megabox
×

Check out, review, and merge locally

Step 1. Fetch and check out the branch for this merge request

git fetch http://khuhub.khu.ac.kr/2021105612/Multiplex_Ticketing_Platform.git master
git checkout -b 2021105612/Multiplex_Ticketing_Platform-master FETCH_HEAD

Step 2. Review the changes locally

Step 3. Merge the branch and fix any conflicts that come up

git checkout feature/Chatbot_megabox
git merge --no-ff 2021105612/Multiplex_Ticketing_Platform-master

Step 4. Push the result of the merge to GitLab

git push origin feature/Chatbot_megabox

Note that pushing to GitLab requires write access to this repository.

Tip: You can also checkout merge requests locally by following these guidelines.

Merged

The changes were merged into feature/Chatbot_megabox.

  • Discussion 0
  • Commits 4
  • Changes 3
  • {{ resolvedDiscussionCount }}/{{ discussionCount }} {{ discussionCount | pluralize 'discussion' }} resolved
  • ShinSeungMin
    @2021105612 2022-06-07 16:06:08 UTC

    Added 3 commits:

    • cb913d7e...07fd5446 - 2 commits from branch 2021105632:feature/Chatbot_megabox
    • a3803d68 - Solve conflict
  • 임승현
    @2021105632 2022-06-07 16:06:38 UTC

    Mentioned in commit 84672c34

  • 임승현
    @2021105632 2022-06-07 16:06:38 UTC

    Status changed to merged

  • Please register or login to post a comment
Assignee
No assignee
Assign to
None
Milestone
None
Assign milestone
2
2 participants
Reference: 2021105632/Multiplex_Ticketing_Platform!32
×

Revert this merge request

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.
×

Cherry-pick this merge request

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.