• This project
    • Loading...
  • Sign in

2021-1-capstone-design1 / HCG_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 !1 opened 2021-05-24 17:33:12 UTC by 양지수@2017104003

Master

Edited 2021-06-18 11:12:25 UTC
Request to merge 2017104003:master into master
×

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/2017104003/HCG_Project1.git master
git checkout -b 2017104003/HCG_Project1-master FETCH_HEAD

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 2017104003/HCG_Project1-master

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 2
  • Commits 22
  • Changes 722
  • {{ resolvedDiscussionCount }}/{{ discussionCount }} {{ discussionCount | pluralize 'discussion' }} resolved
  • 6065f8562f521271db7ea2ce1301f14e?s=80&d=identicon
    Toggle discussion
    양지수
    @2017104003 started a discussion on commit 62852a2a 2021-04-18 10:20:29 UTC
    • 양지수
      @2017104003 commented 2021-04-18 10:20:29 UTC
      Master

      가중치삭제 필요

  • 6065f8562f521271db7ea2ce1301f14e?s=80&d=identicon
    Toggle discussion
    양지수
    @2017104003 started a discussion on commit 73779156 2021-05-24 15:59:43 UTC
    • 양지수
      @2017104003 commented 2021-05-24 15:59:43 UTC
      Master

      kospi_manage.py는 잘몰 올린 것

  • 양지수
    @2017104003 2021-05-24 17:34:17 UTC

    Mentioned in commit 07d85895

  • 양지수
    @2017104003 2021-05-24 17:34:18 UTC

    Status changed to merged

  • 양지수
    @2017104003 2021-06-18 00:51:18 UTC

    Mentioned in commit 70879819

  • 양지수
    @2017104003 2021-06-18 11:11:54 UTC

    Mentioned in merge request !2

  • 양지수
    @2017104003 2021-06-18 11:12:25 UTC

    Mentioned in commit 83a6aba1

  • 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/HCG_Project1!1
×

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.