Skip to content

Commit

Permalink
Update figues for equivocal github configs
Browse files Browse the repository at this point in the history
  • Loading branch information
jennybc committed Jun 21, 2022
1 parent 7d75690 commit f189271
Show file tree
Hide file tree
Showing 5 changed files with 2 additions and 2 deletions.
Binary file added img/maybe_fork.jpeg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed img/maybe_fork.png
Binary file not shown.
Binary file added img/maybe_ours_or_theirs.jpeg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed img/maybe_ours_or_theirs.png
Binary file not shown.
4 changes: 2 additions & 2 deletions remote-setups-equivocal.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ When we detect just one GitHub remote, but we can't verify the info above, useth
```{r maybe_ours_or_theirs}
#| echo = FALSE, fig.align = "center", out.width = "60%",
#| fig.alt = "Setup described as \"maybe_ours_or_theirs\""
knitr::include_graphics("img/maybe_ours_or_theirs.png")
knitr::include_graphics("img/maybe_ours_or_theirs.jpeg")
```

Once a PAT is available, this setup can be identified as being ["ours" (belonging to you)](#ours-you), ["ours" (but belonging to someone else)](#ours-them), or ["theirs"](#theirs).
Expand All @@ -46,7 +46,7 @@ When we detect two GitHub remotes, but we can't verify the info above, usethis d
```{r maybe_fork}
#| echo = FALSE, fig.align = "center", out.width = "60%",
#| fig.alt = "Setup described as \"maybe_fork\""
knitr::include_graphics("img/maybe_fork.png")
knitr::include_graphics("img/maybe_fork.jpeg")
```

Once a PAT is available, this setup can be identified as being a well-configured [fork](#fork-them) or a [fork with incomplete setup](#fork_upstream_is_not_origin_parent) (or possibly something more weird).
Expand Down

0 comments on commit f189271

Please sign in to comment.