mirror of
https://github.com/netdata/libbpf.git
synced 2026-03-19 15:59:06 +08:00
7c15babf40
Merges are common. `git cherry-pick` can't cherry-pick merge commit and requires specifying which of the parents should be cherry-picked, so it's a pain. But merges are also commonly empty, so it's safe to skip them. This change goes through all merges touching libbpf files, checks that they don't have any conflict resolution diffs. If there are any, abort, if not, proceed as usual, ignoring merges. Signed-off-by: Andrii Nakryiko <andriin@fb.com>