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
  • !129

Merged
Opened Oct 24, 2019 by Tobin@tobin 
  • Report abuse
Report abuse

Jansa

Edited Oct 24, 2019 by Tobin
×

Check out, review, and merge locally

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

git fetch origin
git checkout -b jansa origin/jansa

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 jansa

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 3
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Jansa Jose @jansa

    added 3 commits

    • b3b601b6 - 1 commit from branch master
    • 1ffcb4d7 - getEvent and venuedetails
    • ed0cbadd - Merge branch 'master' of https://gitlab.techware.co.in/timeout/timeOut into jansa

    Compare with previous version

    Oct 24, 2019

    added 3 commits

    • b3b601b6 - 1 commit from branch master
    • 1ffcb4d7 - getEvent and venuedetails
    • ed0cbadd - Merge branch 'master' of https://gitlab.techware.co.in/timeout/timeOut into jansa

    Compare with previous version

    added 3 commits <ul><li>b3b601b6 - 1 commit from branch <code>master</code></li><li>1ffcb4d7 - getEvent and venuedetails</li><li>ed0cbadd - Merge branch &#39;master&#39; of https://gitlab.techware.co.in/timeout/timeOut into jansa</li></ul> [Compare with previous version](https://gitlab.techware.co.in/timeout/timeOut/merge_requests/129/diffs?diff_id=1473&start_sha=88ed6cf0a6fbf6d5dd20f3d0c7d3e3eac70de349)
    Toggle commit list
  • Tobin @tobin

    unmarked as a Work In Progress

    Oct 24, 2019

    unmarked as a Work In Progress

    unmarked as a **Work In Progress**
    Toggle commit list
  • Tobin @tobin

    merged

    Oct 24, 2019

    merged

    merged
    Toggle commit list
  • Tobin @tobin

    mentioned in commit de777aba

    Oct 24, 2019

    mentioned in commit de777aba

    mentioned in commit de777aba2c207933d5a5f261ca98af2b2bcdd115
    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!129
×

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.