Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
  • Sign in
W
White Rabbit Switch - Software
  • Project
    • Project
    • Details
    • Activity
    • Cycle Analytics
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
  • Issues 44
    • Issues 44
    • List
    • Board
    • Labels
    • Milestones
  • Merge Requests 1
    • Merge Requests 1
  • CI / CD
    • CI / CD
    • Pipelines
    • Schedules
  • Wiki
    • Wiki
  • image/svg+xml
    Discourse
    • Discourse
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Commits
  • Issue Boards
  • Projects
  • White Rabbit Switch - Software
  • Merge Requests
  • !1

Open
Opened May 20, 2019 by Benoit Rat@benoit
  • Report abuse
Report abuse

Ben 190405 wrdate fixes

@lipinskimm & @baujc: This Merge Request correspond to various commits that have been forked from v5.0.1 THEY HAVE NOT BEEN CHECKED AGAINST proposed_master so please review/test them before merging.

Check out, review, and merge locally

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

git fetch origin
git checkout -b ben-190405-wrdate_fixes origin/ben-190405-wrdate_fixes

Step 2. Review the changes locally

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

git fetch origin
git checkout origin/proposed_master
git merge --no-ff ben-190405-wrdate_fixes

Step 4. Push the result of the merge to GitLab

git push origin proposed_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 19
  • Changes 18
Assignee
No assignee
Assign to
None
Milestone
None
Assign milestone
Time tracking
0
Labels
None
Assign labels
  • View project labels
Reference: project/wr-switch-sw!1