Environment setup
# FAILED
# Cloning kubernetes-sigs/security-profiles-operator at master(49f5464dc2e05fbfaa9d176ca0afb156034824a8)
# Checking out pulls:
#	138(21574f1541668e5a41552686d24ebafdb4fd0f68)
$ mkdir -p /home/prow/go/src/github.com/kubernetes-sigs/security-profiles-operator
$ git init
Initialized empty Git repository in /home/prow/go/src/github.com/kubernetes-sigs/security-profiles-operator/.git/
$ git config user.name ci-robot
$ git config user.email ci-robot@k8s.io
$ git fetch https://github.com/kubernetes-sigs/security-profiles-operator.git --tags --prune
From https://github.com/kubernetes-sigs/security-profiles-operator
 * branch            HEAD       -> FETCH_HEAD
 * [new tag]         v0.1.0     -> v0.1.0
$ git fetch https://github.com/kubernetes-sigs/security-profiles-operator.git master
From https://github.com/kubernetes-sigs/security-profiles-operator
 * branch            master     -> FETCH_HEAD
$ git checkout 49f5464dc2e05fbfaa9d176ca0afb156034824a8
Note: switching to '49f5464dc2e05fbfaa9d176ca0afb156034824a8'.

You are in 'detached HEAD' state. You can look around, make experimental
changes and commit them, and you can discard any commits you make in this
state without impacting any branches by switching back to a branch.

If you want to create a new branch to retain commits you create, you may
do so (now or later) by using -c with the switch command. Example:

  git switch -c <new-branch-name>

Or undo this operation with:

  git switch -

Turn off this advice by setting config variable advice.detachedHead to false

HEAD is now at 49f5464 Add Status field to SeccompProfile
$ git branch --force master 49f5464dc2e05fbfaa9d176ca0afb156034824a8
$ git checkout master
Switched to branch 'master'
$ git fetch https://github.com/kubernetes-sigs/security-profiles-operator.git pull/138/head
From https://github.com/kubernetes-sigs/security-profiles-operator
 * branch            refs/pull/138/head -> FETCH_HEAD
$ git merge --no-ff 21574f1541668e5a41552686d24ebafdb4fd0f68
Removing test/tc_invalid_profile_test.go
Removing test/tc_crd_example_profiles_test.go
Auto-merging internal/pkg/controllers/profile/profile_test.go
Auto-merging internal/pkg/controllers/profile/profile.go
CONFLICT (content): Merge conflict in internal/pkg/controllers/profile/profile.go
Removing examples/profile.yaml
Removing deploy/overlays/cluster/default-profiles.yaml
Auto-merging deploy/operator.yaml
CONFLICT (content): Merge conflict in deploy/operator.yaml
Auto-merging deploy/namespace-operator.yaml
CONFLICT (content): Merge conflict in deploy/namespace-operator.yaml
Removing deploy/base/profiles/nginx-1.19.1.json
Auto-merging deploy/base/crd.yaml
Auto-merging api/v1alpha1/seccompprofile_types.go
Automatic merge failed; fix conflicts and then commit the result.
# Error: exit status 1