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

Jessica Hawkwell / candle-pos

  • This project
    • Loading...
  • Sign in
Go to a project
  • Project
  • Repository
  • Issues 0
  • Merge Requests 0
  • Pipelines
  • Wiki
  • Snippets
  • Settings
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Merged
Merge Request !3 opened May 28, 2017 by Jessica Hawkwell@LadySerenaKitty

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

Step 4. Push the result of the merge to GitLab

git push origin develop

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 1
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Jessica Hawkwell @LadySerenaKitty

    mentioned in commit 2253e00d

    May 28, 2017

    mentioned in commit 2253e00d

    mentioned in commit 2253e00d6f185194eea77ca31a6c4e00e2e8e35b
    Toggle commit list
  • Jessica Hawkwell @LadySerenaKitty

    merged

    May 28, 2017

    merged

    merged
    Toggle commit list
  • Jessica Hawkwell @LadySerenaKitty

    removed assignee

    May 28, 2017

    removed assignee

    removed assignee
    Toggle commit list
  • Jessica Hawkwell @LadySerenaKitty

    mentioned in commit f46440c5

    May 30, 2017

    mentioned in commit f46440c5

    mentioned in commit f46440c5444ba8cdc595e81519fc96ca1203c8f3
    Toggle commit list
  • Write
  • Preview
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
  • Please register or sign in to post a comment
Assignee
No assignee
Assign to
None
Milestone
None
Assign milestone
Time tracking
0
Labels
None
Assign labels
  • View labels
1
1 participant
Reference: LadySerenaKitty/candle-pos!3
×

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.