Skip to content

Change cp command to use -rfL option (backport #335)#337

Merged
Amronos merged 2 commits into
humblefrom
mergify/bp/humble/pr-335
May 13, 2026
Merged

Change cp command to use -rfL option (backport #335)#337
Amronos merged 2 commits into
humblefrom
mergify/bp/humble/pr-335

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify Bot commented May 13, 2026

resolve symlinks from extra_packages folder

#320
(changed branch to rolling)


This is an automatic backport of pull request #335 done by Mergify.

Resolve symlinks from the `extra_packages` directory

(cherry picked from commit 2f73852)

# Conflicts:
#	libmicroros.mk
@mergify mergify Bot added the conflicts label May 13, 2026
@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented May 13, 2026

Cherry-pick of 2f73852 has failed:

On branch mergify/bp/humble/pr-335
Your branch is up to date with 'origin/humble'.

You are currently cherry-picking commit 2f73852.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   libmicroros.mk

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@Amronos Amronos merged commit c706796 into humble May 13, 2026
11 of 17 checks passed
@Amronos Amronos deleted the mergify/bp/humble/pr-335 branch May 13, 2026 23:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants