• This project
    • Loading...
  • Sign in

2021-1-capstone-design1 / JSH_Project1

%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 !3 opened 2021-05-31 16:50:31 UTC by 김유현@2018102178

[eschung] npc 대화 적용

Edited 2021-05-31 16:50:36 UTC
Request to merge eschung into develop
×

Check out, review, and merge locally

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

git fetch origin
git checkout -b eschung origin/eschung

Step 2. Review the changes locally

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

git checkout develop
git merge --no-ff eschung

Step 4. Push the result of the merge to GitLab

git push origin develop

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

  • Discussion 0
  • Commits 1
  • Changes 112
  • {{ resolvedDiscussionCount }}/{{ discussionCount }} {{ discussionCount | pluralize 'discussion' }} resolved
  • 김유현
    @2018102178 2021-05-31 16:50:36 UTC

    Mentioned in commit 96c174ea

  • 김유현
    @2018102178 2021-05-31 16:50:36 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: 2021-1-capstone-design1/JSH_Project1!3
×

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.