Skip to content

GitLab

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
  • Sign in
T
trisquel-packages
  • 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
  • Operations
    • Operations
    • Incidents
  • Analytics
    • Analytics
    • Repository
    • Value Stream
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Create a new issue
  • Commits
  • Issue Boards
  • trisquel
  • trisquel-packages
  • Merge Requests
  • !9

Open
Opened Oct 08, 2018 by Andrew M. 'Leny' Lindley@leny2010
  • 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://gitlab.trisquel.org/leny2010/trisquel-packages.git" "bug/triskel-missing-kwin"
git checkout -b "leny2010/trisquel-packages-bug/triskel-missing-kwin" 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 "leny2010/trisquel-packages-bug/triskel-missing-kwin"

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.

Triskel missing kwin

  • Overview 1
  • Commits 1
  • Changes 1

A tasksel install of triskel resulted in KDE not having a window manager. The default is kwin. Added to triskel depends.

Assignee
Assign to
None
Milestone
None
Assign milestone
Time tracking
Reference: trisquel/trisquel-packages!9
Source branch: bug/triskel-missing-kwin