Skip to content

GitLab

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
  • Sign in / Register
desktop
desktop
  • Project overview
    • Project overview
    • Details
    • Activity
    • Releases
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Locked Files
  • Issues 16
    • Issues 16
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
    • Iterations
  • Merge Requests 6
    • Merge Requests 6
  • Requirements
    • Requirements
    • List
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
  • Security & Compliance
    • Security & Compliance
    • Dependency List
    • License Compliance
  • Operations
    • Operations
    • Incidents
    • Environments
  • Analytics
    • Analytics
    • CI / CD
    • Code Review
    • Insights
    • Issue
    • Repository
    • Value Stream
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
  • Chakra
  • Packages
  • desktopdesktop
  • Merge Requests
  • !133

Open
Opened Feb 28, 2020 by Francesco Marinucci@FranzMariDeveloper
  • Report abuse
Report abuse

Check out, review, and merge locally

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

git fetch origin
git checkout -b "254-some-packages-need-to-be-rebuilt-against-glew-2-1-0" "origin/254-some-packages-need-to-be-rebuilt-against-glew-2-1-0"

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 "254-some-packages-need-to-be-rebuilt-against-glew-2-1-0"

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.

Resolve "Some packages need to be rebuilt against glew-2.1.0"

  • Overview 3
  • Commits 33
  • Pipelines 17
  • Changes 11

Closes #254

Edited Jul 01, 2020 by Francesco Marinucci
Assignee
Assign to
None
Milestone
None
Assign milestone
Time tracking
Reference: chakra/packages/desktop!133
Source branch: 254-some-packages-need-to-be-rebuilt-against-glew-2-1-0