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

abalsh / Garlix

  • This project
    • Loading...
  • Sign in
Go to a project
  • Project
  • Repository
  • Issues 0
  • Merge Requests 0
  • Pipelines
  • Wiki
  • Snippets
  • Members
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Merged
Merge request !1 opened May 14, 2019 by abalsh@abalsh 
  • Report abuse
Report abuse

Laravel

Mergin Laravel to 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 laravel origin/laravel

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 laravel

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 45
  • Changes 630+
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • abalsh @abalsh

    added 4 commits

    • 87eadb51...e3e891fc - 3 commits from branch master
    • 503f967d - Merge branch 'master' into laravel

    Compare with previous version

    May 14, 2019

    added 4 commits

    • 87eadb51...e3e891fc - 3 commits from branch master
    • 503f967d - Merge branch 'master' into laravel

    Compare with previous version

    added 4 commits * 87eadb51...e3e891fc - 3 commits from branch `master` * 503f967d - Merge branch 'master' into laravel [Compare with previous version](https://gitlab.pld.ttu.ee/abalsh/Garlix/merge_requests/1/diffs?diff_id=168&start_sha=87eadb51632c4481907a3ee9e269f7d8e3d9f303)
    Toggle commit list
  • abalsh @abalsh

    merged

    May 14, 2019

    merged

    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
abalsh
Assignee
abalsh @abalsh
Assign to
None
Milestone
None
Assign milestone
Time tracking
1
1 participant
Reference: abalsh/Garlix!1