Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
  • This project
    • Loading...
  • Sign in / Register
E
eduhealth
  • 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
  • amal
  • eduhealth
  • Merge Requests
  • !2

Closed
Opened Jun 20, 2019 by amal@amal 
  • Report abuse
Report abuse

WIP: Amal

×

Check out, review, and merge locally

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

git fetch origin
git checkout -b amal origin/amal

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 amal

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 3
  • Changes 1
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • amal @amal

    added 7 commits

    • 0971fb01...af916aae - 5 commits from branch master
    • 8e69083c - 26-06-2019
    • 1fb6550b - Merge branch 'master' into amal

    Compare with previous version

    Jun 26, 2019

    added 7 commits

    • 0971fb01...af916aae - 5 commits from branch master
    • 8e69083c - 26-06-2019
    • 1fb6550b - Merge branch 'master' into amal

    Compare with previous version

    added 7 commits <ul><li>0971fb01...af916aae - 5 commits from branch <code>master</code></li><li>8e69083c - 26-06-2019</li><li>1fb6550b - Merge branch &#39;master&#39; into amal</li></ul> [Compare with previous version](https://gitlab.techware.co.in/amal/eduhealth/merge_requests/2/diffs?diff_id=937&start_sha=0971fb010cd3dd2b9d58698978e563f6a790d240)
    Toggle commit list
  • amal @amal

    added 8 commits

    • 1fb6550b...90806bb4 - 7 commits from branch master
    • 06cc48e8 - Merge branch 'master' into amal

    Compare with previous version

    Jun 27, 2019

    added 8 commits

    • 1fb6550b...90806bb4 - 7 commits from branch master
    • 06cc48e8 - Merge branch 'master' into amal

    Compare with previous version

    added 8 commits <ul><li>1fb6550b...90806bb4 - 7 commits from branch <code>master</code></li><li>06cc48e8 - Merge branch &#39;master&#39; into amal</li></ul> [Compare with previous version](https://gitlab.techware.co.in/amal/eduhealth/merge_requests/2/diffs?diff_id=945&start_sha=1fb6550b2232c13ccde31cf5357e7ac8babb5423)
    Toggle commit list
  • amal @amal

    closed

    Jun 27, 2019

    closed

    closed
    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
amal
Assignee
amal @amal
Assign to
None
Milestone
None
Assign milestone
Time tracking
0
Labels
None
Assign labels
  • View project labels
Reference: amal/eduhealth!2