Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
    • Help
    • Support
    • Submit feedback
  • Sign in / Register
P
phoc
  • Project overview
    • Project overview
    • Details
    • Activity
    • Releases
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
  • Issues 101
    • Issues 101
    • List
    • Boards
    • Labels
    • Milestones
  • Merge Requests 7
    • Merge Requests 7
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
  • Packages & Registries
    • Packages & Registries
    • Container Registry
  • Analytics
    • Analytics
    • CI / CD
    • Repository
    • Value Stream
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
  • Librem5
  • phoc
  • Merge Requests
  • !116

Open
Opened Dec 30, 2019 by Guido Gunther@guido.gunther
  • Report abuse
Report abuse

wip: xdg-foreign

  • Overview 2
  • Commits 7
  • Pipelines 1
  • Changes 16

only the export side but just in case #90 becomes more urgent

Check out, review, and merge locally

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

git fetch "https://source.puri.sm/guido.gunther/phoc.git" "wip/xdg-foreign"
git checkout -b "guido.gunther/phoc-wip/xdg-foreign" 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 "origin/master"
git merge --no-ff "guido.gunther/phoc-wip/xdg-foreign"

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.

Assignee
Assign to
None
Milestone
None
Assign milestone
Time tracking
0
Labels
None
Assign labels
  • View project labels
Reference: Librem5/phoc!116