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

triazo / kernel

  • This project
    • Loading...
  • Sign in
Go to a project
  • Project
  • Repository
  • Issues 3
  • Merge Requests 0
  • Wiki
  • Settings
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Commits
  • Issue Boards
Merged
Merge request !15 opened Nov 17, 2015 by malcolm@malcolm 

Interactive

Good enough for merge.

×

Check out, review, and merge locally

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

git fetch origin
git checkout -b interactive origin/interactive

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 interactive

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 18
  • Changes
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • triazo @triazo

    Status changed to merged

    Nov 18, 2015

    Status changed to merged

    Status changed to merged
    Toggle commit list
  • triazo @triazo

    mentioned in commit 4d9fc048

    Nov 18, 2015

    mentioned in commit 4d9fc048

    mentioned in commit 4d9fc0485ca2ed344390a1a5ff30bf569e046e34
    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
triazo
Assignee
triazo @triazo
Assign to
None
Milestone
None
Assign milestone
Time tracking
2
2 participants
Reference: triazo/kernel!15