Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
  • This project
    • Loading...
  • Sign in / Register
M
marketing
  • Overview
    • Overview
    • Details
    • Activity
    • Cycle Analytics
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
  • Issues 0
    • Issues 0
    • List
    • Board
    • Labels
    • Milestones
  • Merge Requests 0
    • Merge Requests 0
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
    • Charts
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
  • marketing-web
  • marketing
  • Merge Requests
  • !68

Merged
Opened May 28, 2020 by chenxin@chenxin 
  • Report abuse
Report abuse

fix:build

×

Check out, review, and merge locally

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

git fetch origin
git checkout -b dev origin/dev

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 dev

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.

  • Discussion 0
  • Commits 2
  • Changes 5
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • chenxin @chenxin

    added 20 commits

    • 6d44afbe...c61868d4 - 19 commits from branch master
    • ad2778ba - Merge branch 'master' into 'dev'

    Compare with previous version

    May 28, 2020

    added 20 commits

    • 6d44afbe...c61868d4 - 19 commits from branch master
    • ad2778ba - Merge branch 'master' into 'dev'

    Compare with previous version

    added 20 commits <ul><li>6d44afbe...c61868d4 - 19 commits from branch <code>master</code></li><li>ad2778ba - Merge branch &#39;master&#39; into &#39;dev&#39;</li></ul> [Compare with previous version](http://115.159.76.241/marketing-web/marketing/merge_requests/68/diffs?diff_id=12842&start_sha=6d44afbe4e561717ae5215cadd111501092a1681)
    Toggle commit list
  • chenxin @chenxin

    closed

    May 28, 2020

    closed

    closed
    Toggle commit list
  • chenxin @chenxin

    reopened

    May 28, 2020

    reopened

    reopened
    Toggle commit list
  • chenxin @chenxin

    merged

    May 28, 2020

    merged

    merged
    Toggle commit list
  • chenxin @chenxin

    mentioned in commit ab89a6ca

    May 28, 2020

    mentioned in commit ab89a6ca

    mentioned in commit ab89a6ca99681a3b31bb535d9dbc8cdb154ead17
    Toggle commit list
  • Write
  • Preview
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment
chenxin
Assignee
chenxin @chenxin
Assign to
None
Milestone
None
Assign milestone
Time tracking
Reference: marketing-web/marketing!68
×

Revert this merge request

This will create a new commit in order to revert the existing changes.

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.