Skip to content

GitLab

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
  • Sign in
M
manjaro-software-install-tools
  • Project overview
    • Project overview
    • Details
    • Activity
    • Releases
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Locked Files
  • Issues 1
    • Issues 1
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 1
    • Merge Requests 1
  • Requirements
    • Requirements
    • List
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
  • Security & Compliance
    • Security & Compliance
    • Dependency List
    • License Compliance
  • Operations
    • Operations
    • Environments
  • Packages & Registries
    • Packages & Registries
    • Container Registry
  • Analytics
    • Analytics
    • CI / CD
    • Code Review
    • Insights
    • Issue
    • Repository
    • Value Stream
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
  • Stefano Capitani
  • manjaro-software-install-tools
  • Merge Requests
  • !3

Open
Opened Aug 17, 2018 by patrick@papajoke
  • 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.manjaro.org/papajoke/manjaro-software-install-tools.git" "moreone"
git checkout -b "papajoke/manjaro-software-install-tools-moreone" 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 "papajoke/manjaro-software-install-tools-moreone"

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.

Moreone

  • Overview 5
  • Commits 9
  • Changes 1

5a987676 (comment 9355)

notes:

manjaro: i don't have Papirus thème (ok view papirus-maia-icon-theme in PKGBUILD)

archlinux: not /Papirus/ but /papirus/ (papirus-icon-theme-kde) ??

for me, for view icons, i have add a parameter "theme" in python script (def addSoftware)

With my arch, script break for set app icon (/usr/share/icons/manjaro/maia/48x48.png) I have make one except for use this script if icon not exist

Edited Aug 18, 2018 by patrick
Assignee
Assign to
None
Milestone
None
Assign milestone
Time tracking
0
Labels
None
Assign labels
  • View project labels
Reference: ste74/manjaro-software-install-tools!3
Source branch: moreone