Skip to content
  • This project
    • Loading...
  • Sign in

Yokihito Oki / kanoya-univercity-prod

Go to a project
Toggle navigation
Toggle navigation pinning
  • Projects
  • Groups
  • Snippets
  • Help
  • Project
  • Activity
  • Repository
  • Pipelines
  • Graphs
  • Issues 0
  • Merge Requests 0
  • Wiki
  • Network
  • Create a new issue
  • Builds
  • Commits
  • Issue Boards
Merged
Merge Request !27 opened 2020-09-01 08:40:32 +0900 by TaishiTokudome@tokudome

Masterからinterview_devにマージリクエスト

インタビューページの開発ブランチにMasterからの差分を取り込む

Edited 2020-09-01 09:36:26 +0900
Request to merge master into interview_dev
×

Check out, review, and merge locally

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

git fetch origin
git checkout -b master origin/master

Step 2. Review the changes locally

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

git checkout interview_dev
git merge --no-ff master

Step 4. Push the result of the merge to GitLab

git push origin interview_dev

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

  • Discussion 0
  • Commits 60
  • Changes 57
  • {{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Toggle discussion
    TaishiTokudome
    @tokudome started a discussion on commit 34395a2c 2020-08-06 14:08:28 +0900
    • TaishiTokudome
      @tokudome

      mentioned in commit 4da3dce2

      2020-08-06 14:08:28 +0900

      mentioned in commit 4da3dce2

      Toggle commit list
  • TaishiTokudome
    @tokudome

    changed title from Master to インタビューページの開発ブランチにMasterからの差分を取り込む

    2020-09-01 08:41:46 +0900

    changed title from Master to インタビューページの開発ブランチにMasterからの差分を取り込む

    Toggle commit list
  • TaishiTokudome
    @tokudome

    changed title from インタビューページの開発ブランチにMasterからの差分を取り込む to Masterからinterview_dev

    2020-09-01 08:42:14 +0900

    changed title from インタビューページの開発ブランチにMasterからの差分を取り込む to Masterからinterview_dev

    Toggle commit list
  • TaishiTokudome
    @tokudome

    changed title from Masterからinterview_dev to Masterからinterview_devにマージリクエスト

    2020-09-01 08:42:41 +0900

    changed title from Masterからinterview_dev to Masterからinterview_devにマージリクエスト

    Toggle commit list
  • TaishiTokudome
    @tokudome

    merged

    2020-09-01 09:36:26 +0900

    merged

    Toggle commit list
  • Write
  • Preview
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
  • Please register or sign in to post a comment
Assignee
No assignee
Assign to
None
Milestone
None
Assign milestone
Time tracking
1
1 participant
Reference: oki/kanoya-univercity-prod!27