• This project
    • Loading...
  • Sign in

박민정 / We-Shop

%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
  • Snippets
  • Network
  • Create a new issue
  • Builds
  • Commits
  • Issue Boards
Merged
Merge Request !2 opened 2021-06-09 14:22:10 UTC by 박민정@2018110650

Server

Edited 2021-06-09 14:22:19 UTC
Request to merge server 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 server origin/server

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 server

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 9
  • Changes 24
  • {{ resolvedDiscussionCount }}/{{ discussionCount }} {{ discussionCount | pluralize 'discussion' }} resolved
  • 442db3bac11aa3daa101b8d66d5d26e8?s=80&d=identicon
    Toggle discussion
    박민정
    @2018110650 started a discussion on commit 011d944f 2021-06-09 13:06:04 UTC
    • 박민정
      @2018110650 2021-06-09 13:06:04 UTC

      Mentioned in commit 20e62fef

  • 박민정
    @2018110650 2021-06-09 14:22:19 UTC

    Status changed to merged

  • 박민정
    @2018110650 2021-06-09 14:22:19 UTC

    Mentioned in commit 081e26d8

  • Please register or login to post a comment
Assignee
No assignee
Assign to
None
Milestone
None
Assign milestone
0
Labels
None
Assign labels
  • View labels
1
1 participant
Reference: 2018110650/We-Shop!2
×

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.