Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
  • This project
    • Loading...
  • Sign in / Register
T
TimeOutAdmin
  • Project
    • 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
  • TimeOut
  • TimeOutAdmin
  • Merge Requests
  • !4

Merged
Opened Mar 08, 2019 by Tobin@tobin 
  • Report abuse
Report abuse

Master

×

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 dev_production
git merge --no-ff master

Step 4. Push the result of the merge to GitLab

git push origin dev_production

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 17
  • Changes 62
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Tobin @tobin

    added 7 commits

    • 0f8dd2d8...f0bd4ec0 - 6 commits from branch dev_production
    • cdc92531 - Merge branch 'dev_production' into 'master'

    Compare with previous version

    Mar 08, 2019

    added 7 commits

    • 0f8dd2d8...f0bd4ec0 - 6 commits from branch dev_production
    • cdc92531 - Merge branch 'dev_production' into 'master'

    Compare with previous version

    added 7 commits <ul><li>0f8dd2d8...f0bd4ec0 - 6 commits from branch <code>dev_production</code></li><li>cdc92531 - Merge branch &#39;dev_production&#39; into &#39;master&#39;</li></ul> [Compare with previous version](https://gitlab.techware.co.in/tobin/timeOut/merge_requests/4/diffs?diff_id=607&start_sha=0f8dd2d88cc084bdc09def9d95dcf7557a03f3b7)
    Toggle commit list
  • Tobin @tobin

    merged

    Mar 08, 2019

    merged

    merged
    Toggle commit list
  • Tobin @tobin

    mentioned in commit 07384d4d

    Mar 08, 2019

    mentioned in commit 07384d4d

    mentioned in commit 07384d4d14e6a18d8b4091b8069704ad94a12dcf
    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
Assignee
No assignee
Assign to
None
Milestone
None
Assign milestone
Time tracking
0
Labels
None
Assign labels
  • View project labels
Reference: timeout/timeOut!4
×

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.