• This project
    • Loading...
  • Sign in

조아혜 / cfr-chatbot

%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 !1 opened 2020-12-07 04:20:27 UTC by 조아혜@2018102237

chatbot branch merge

챗봇 기능 구현

  • cfr을 이용할 때(얼굴 인식 성공 시): 인식된 감정, 나이, 성별을 기반으로 맛집 추천
  • cfr을 이용할 때(얼굴 인식 실패 시): 위치 기반으로 맛집 추천
  • cfr을 이용하지 않을 때: 메뉴 랜덤 또는 위치 기반 선택하여 맛집 추천
Edited 2020-12-07 05:35:02 UTC
Request to merge chatbot into master
×

Check out, review, and merge locally

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

git fetch origin
git checkout -b chatbot origin/chatbot

Step 2. Review the changes locally

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

git checkout master
git merge --no-ff chatbot

Step 4. Push the result of the merge to GitLab

git push origin master

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 master.

  • Discussion 0
  • Commits 26
  • Changes 4
  • {{ resolvedDiscussionCount }}/{{ discussionCount }} {{ discussionCount | pluralize 'discussion' }} resolved
  • 조아혜
    @2018102237 2020-12-07 04:53:41 UTC

    Added 1 commit:

    • 3ca0d277 - add README.md
  • 조아혜
    @2018102237 2020-12-07 05:35:02 UTC

    Status changed to merged

  • Please register or login to post a comment
Assignee
No assignee
Assign to
None
Milestone
None
Assign milestone
1
1 participant
Reference: 2018102237/cfr-chatbot!1