Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
    • Help
    • Submit feedback
    • Contribute to GitLab
  • Sign in / Register
dumux
dumux
  • Project
    • Project
    • Details
    • Activity
    • Releases
    • Cycle Analytics
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
  • Issues 74
    • Issues 74
    • List
    • Board
    • Labels
    • Milestones
  • Merge Requests 29
    • Merge Requests 29
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
    • Charts
  • Wiki
    • Wiki
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
  • dumux-repositories
  • dumuxdumux
  • Merge Requests
  • !1081

Open
Opened Jul 09, 2018 by Timo Koch@timok
  • Report abuse
Report abuse

WIP: Feature/feature list

Introduces a new folder "examples" that will host documented examples in the future. There are different from tests, which are meant only for testing and are not necessarily instructive.

Fixes #520
Fixes #378

Edited Jul 20, 2018 by Kilian Weishaupt

Check out, review, and merge locally

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

git fetch origin
git checkout -b feature/feature-list origin/feature/feature-list

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 feature/feature-list

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 3
Assignee
No assignee
Assign to
3.1
Milestone
3.1
Assign milestone
Time tracking
2
Labels
Dumux Day Feature Request
Assign labels
  • View project labels
Reference: dumux-repositories/dumux!1081