Skip to content

Commit

Permalink
fix minor typo (jennybc#176)
Browse files Browse the repository at this point in the history
  • Loading branch information
zakvarty authored Nov 2, 2021
1 parent 309dcf0 commit 2c4ae69
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion workflows-upstream-changes-into-fork.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -201,4 +201,4 @@ If you chose to create a branch with your work, you will also have that locally:
-- X -- Y -- Z (my-great-innovations)
```

If you pushed your alternative history (with commits `X`, `Y`, and `Z`) to your fork `YOU/REPO` and you like keeping everything synced up, you will also need to force push `master` via `git push --force`, but we really really don't like discussing force pushes in Happy Git. We only do so here, because we are talking about a fork, which is fairly easy to replace if things so sideways.
If you pushed your alternative history (with commits `X`, `Y`, and `Z`) to your fork `YOU/REPO` and you like keeping everything synced up, you will also need to force push `master` via `git push --force`, but we really really don't like discussing force pushes in Happy Git. We only do so here, because we are talking about a fork, which is fairly easy to replace if things go sideways.

0 comments on commit 2c4ae69

Please sign in to comment.