Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
    • Help
    • Support
    • Submit feedback
    • Contribute to GitLab
  • Sign in / Register
kwant
kwant
  • Project overview
    • Project overview
    • Details
    • Activity
    • Releases
    • Cycle Analytics
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
  • Issues 114
    • Issues 114
    • List
    • Boards
    • Labels
    • Milestones
  • Merge Requests 14
    • Merge Requests 14
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
    • Charts
  • Packages
    • Packages
    • Container Registry
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
  • kwant
  • kwantkwant
  • Merge Requests
  • !148

Closed
Opened Jun 20, 2017 by Clisson Paul@Paul1
  • Report abuse
Report abuse

WIP : Add FAQ

Edited Jun 23, 2017 by Clisson Paul

Check out, review, and merge locally

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

git fetch "https://gitlab.kwant-project.org/Paul/kwant.git" "master"
git checkout -b "Paul/kwant-master" FETCH_HEAD

Step 2. Review the changes locally

Step 3. Merge the branch and fix any conflicts that come up

git fetch origin
git checkout "origin/master"
git merge --no-ff "Paul/kwant-master"

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 43
  • Commits 10
  • Pipelines 9
  • Changes 4
Assignee
Assign to
Kwant 1.3.2
Milestone
Kwant 1.3.2
Assign milestone
Time tracking
0
Labels
None
Assign labels
  • View project labels
Reference: kwant/kwant!148