Skip to content
  • P
    Projects
  • G
    Groups
  • S
    Snippets
  • Help

ipgallery / location-service

  • This project
    • Loading...
  • Sign in
Go to a project
  • Project
  • Repository
  • Registry
  • Issues 0
  • Merge Requests 0
  • Settings
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Commits
  • Issue Boards
Merged
Merge request !1 opened Apr 20, 2016 by Gil Sade@gils 

added cfg + changed docker file

×

Check out, review, and merge locally

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

git fetch origin
git checkout -b develop origin/develop

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 develop

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 1
  • Changes 2
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Gil Sade @gils

    mentioned in commit 339c97b8

    Apr 20, 2016

    mentioned in commit 339c97b8

    mentioned in commit 339c97b8fac07349dd91a4d1878786ad3461a4cc
    Toggle commit list
  • Gil Sade @gils

    Status changed to merged

    Apr 20, 2016

    Status changed to merged

    Status changed to merged
    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
1
1 participant
Reference: mcx/location-service!1
×

Revert this merge request

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.