Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
    • Help
    • Support
    • Submit feedback
    • Contribute to GitLab
  • Sign in
B
busybox
  • Project overview
    • Project overview
    • Details
    • Activity
    • Releases
    • Cycle Analytics
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
  • Labels
  • Merge Requests 1
    • Merge Requests 1
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
    • Charts
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Jobs
  • Commits
  • mer-core
  • busybox
  • Merge Requests
  • !7

Merged
Opened Jan 10, 2019 by Tomi Leppänen@tomin
  • Report abuse
Report abuse

Conflict instead of obsolete in symlinks packages

  • Overview 0
  • Commits 1
  • Changes 1

[packaging] Replace obsoletes in symlink-findutils. Contributes to JB#36243 [packaging] Replace obsoletes in symlink-grep. Contributes to JB#40843 [packaging] Replace obsoletes in symlink-diffutils. Contributes to JB#36423 Also provide /bin/grep in busybox-symlinks-grep for oneshot.

Check out, review, and merge locally

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

git fetch "https://git.sailfishos.org/tomin/busybox.git" "jb36243_jb36423_jb40843"
git checkout -b "tomin/busybox-jb36243_jb36423_jb40843" 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 "tomin/busybox-jb36243_jb36423_jb40843"

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: mer-core/busybox!7

Revert this merge request

This will create a new commit in order to revert the existing changes.

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.

Cherry-pick this merge request

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.