• This project
    • Loading...
  • Sign in

이세진 / dev-profile

%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 10
  • Merge Requests 0
  • Wiki
  • Snippets
  • Network
  • Create a new issue
  • Builds
  • Commits
  • Issue Boards
Merged
Merge Request !1 opened 2021-05-10 20:10:17 UTC by 김채리@2020103862

updated README

처음에 fork 하고 실수로 branch 안만들고 수정 내용 commit/push 해버려서
다시 원래 상태로 되돌리고 master에 commit하고 branch 새로 만들어서 수정 내용 다시 commit하느라
commit이 세 개가 되어버렸네요.....
어차피 1, 3번째 commit은 같은 내용이니까 다른거 무시하시고 세번째 commit만 유효하다고 생각해주세요..!
앞으로는 주의하도록 하겠습니다,,


  • Added contents to README file based on our meeting. Will update as our web page improves.
  • Added blank space between "Login" and "Join" in [home.pug]

  • Planning to make more commits ASAP containing new API contents,,

Edited 2021-05-14 11:06:00 UTC
Request to merge 2021_dev-profile:reme 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/2021_dev-profile/dev-profile.git reme
git checkout -b 2021_dev-profile/dev-profile-reme 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 2021_dev-profile/dev-profile-reme

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 3
  • Changes 2
  • {{ resolvedDiscussionCount }}/{{ discussionCount }} {{ discussionCount | pluralize 'discussion' }} resolved
  • 이세진
    @2018102216 2021-05-14 11:05:59 UTC

    Mentioned in commit bd61a816

  • 이세진
    @2018102216 2021-05-14 11:06:00 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: 2018102216/dev-profile!1
×

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.