updating link to code of conduct and security docs to org

[vsoch]

Signed-off-by: Vanessa Sochat [email protected]

opencontainers/.github#3

[cyphar]

Should be [security].

[vsoch]

okay I think I got it right this time.

[cyphar]

Please squash your commits.

[vsoch]

Can't we squash on merge?

[cyphar]

We can, but I don't like doing it because it screws up the author's GPG signed commits. But if you'd prefer that, I can do it (I do merge commits locally because I want to sign those too).

[vsoch]

I definitely can - I’ve never squashed locally before. How do I do it?

[cyphar]

The most generic way to do it is with an interactive git rebase (git rebase -i). Effectively you would do:

% git rebase -i origin/master

which will open your text editor, with a bunch of lines like this:

pick c6297bdbfacf updating link to code of conduct and security docs to org
pick defb213bc44c fixing security link
pick 89c3a9d3f036 fixing code of conduct link

Each line is one commit, in order -- and the idea is that the interactive rebase will apply each line in-order (pick just means to use that commit -- it comes from git cherry-pick).

This allows you to mess with the commits individually (you could re-order them or edit them), but since we want to squash them we can use squash. So you'd change the above lines to:

pick c6297bdbfacf updating link to code of conduct and security docs to org
squash defb213bc44c fixing security link
squash 89c3a9d3f036 fixing code of conduct link

However, we don't care about your commit messages, so we can use fixup (which is like squash but ignores the commit messages and doesn't ask you to edit them). You can also use shorthand like f for fixup if you prefer.

pick c6297bdbfacf updating link to code of conduct and security docs to org
fixup defb213bc44c fixing security link
fixup 89c3a9d3f036 fixing code of conduct link

Which will translate to:

1. Use the commit c6297bd.
2. Squash defb213 into the previous commit (c6297bd) to create a new commit $foo, with the commit message from c6297bd.
3. Squash 89c3a9d into the previous commit ($foo) to create a new commit $bar, with the commit message from $foo.

And finally your current branch will now be $bar. If it's still a bit confusing, you could look up some tutorials online about interactive rebasing.

[vsoch]

Cool I've never done that - this looks fun! Be back after futzing around a bit :)

[vsoch]

okay I'm not sure I catch the $foo $bar mapping to fix/CoC-link and origin/master, but I did something and I'm going to try pushing it. Worst case scenario I'll just start over.

[vsoch]

Nope, definitely failed. Can you explain the $foo $bar mapping?

[vsoch]

Let's use this one instead #1997

[cyphar]

You don't need to worry about $foo or $bar -- you just need to change the lines like I said. The merge commit you have here is probably because you did a git pull. Fixing this is much less fun (I personally have git pull --rebase set up to be done by default, because it leads to less issues like that).