Skip to content

GitLab

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
  • Sign in / Register
M
monero-site
  • Project overview
    • Project overview
    • Details
    • Activity
    • Releases
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
  • Issues 2
    • Issues 2
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 5
    • Merge Requests 5
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
  • Operations
    • Operations
    • Incidents
    • Environments
  • Analytics
    • Analytics
    • CI / CD
    • Repository
    • Value Stream
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
  • monero-project
  • monero-site
  • Merge Requests
  • !1174

Closed
Opened Dec 15, 2019 by erciccione@erciccioneReporter
  • Report abuse
Report abuse

Check out, review, and merge locally

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

git fetch "https://repo.getmonero.org/erciccione/monero-site.git" "wrng"
git checkout -b "erciccione/monero-site-wrng" 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 "master"
git merge --no-ff "erciccione/monero-site-wrng"

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.

Add to all languages the strings introduced with the recent merges

  • Overview 2
  • Commits 1
  • Changes 11

Based on !1173 (merged) (review only commit 1cb14ca5)

To review this PR, just build it locally and you'll see that most of the warnings are now gone.

Edited Jan 25, 2020 by erciccione
Assignee
Assign to
None
Milestone
None
Assign milestone
Time tracking
Reference: monero-project/monero-site!1174
Source branch: wrng