Skip to content

Update links for resolving merge conflicts #238

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
usrbinr wants to merge 2 commits into
base: main
Choose a base branch
from
+7 −7
Open

Update links for resolving merge conflicts #238

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d58a004
Update links for resolving merge conflicts
usrbinr Nov 30, 2025
0f11de2
incorporate Jenny's feedback for intenral links
usrbinr Dec 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions workflows-pull.Rmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,9 +151,9 @@ Auto-merging foo.R
CONFLICT (content): Merge conflict in foo.R
```

At this point, you must resolve the merge conflict (*future link*). Literally, at each locus of conflict, pick one version or the other (upstream or stashed) or create a hybrid yourself. Remove the all the markers inserted to demarcate the conflicts. Save.
At this point, you must resolve the [merge conflict](#fusion-conflicts)). Literally, at each locus of conflict, pick one version or the other (upstream or stashed) or create a hybrid yourself. Remove the all the markers inserted to demarcate the conflicts. Save.

Since `git stash pop` did not go smoothly, we need to manually reset (*future link*) and delete the stash to finish.
Since `git stash pop` did not go smoothly, we need to [manually reset](#manually-reset) and delete the stash to finish.

``` sh
jenny@2015-mbp ethel $ git reset
Expand Down Expand Up @@ -207,7 +207,7 @@ CONFLICT (content): Merge conflict in foo.R
Automatic merge failed; fix conflicts and then commit the result.
```

You must resolve these conflicts (*future link*). Literally, at each locus of conflict, pick one version or the other (upstream or local) or create a hybrid yourself. Remove the all the markers inserted to demarcate the conflicts. Save.
You must [resolve these conflicts](#git-branches). Literally, at each locus of conflict, pick one version or the other (upstream or local) or create a hybrid yourself. Remove the all the markers inserted to demarcate the conflicts. Save.

Mark the affected file `foo.R` as resolved via `git add` and make an explicit `git commit` to finalize this merge.

Expand Down
4 changes: 2 additions & 2 deletions workflows-repeated-amend.Rmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

One of the principal joys of version control is the freedom to experiment without fear.
If you make a mess of things, you can always go back to a happier version of your project.
We describe several methods of such time travel in *link to come*.
We describe several methods of such time travel in [Time travel: See the past](#time-travel-see-past).
But you must have a good commit to fall back to!

## Rock climbing analogy
Expand Down Expand Up @@ -168,7 +168,7 @@ Use "Discard chunk" to discard specific changes in a file.
Repeat this procedure for each affected file until you are back to an acceptable state.
Carry on.

If you committed a bad state, go to *link to come* for more reset scenarios.
If you committed a bad state, go to [Resetting](#reset) for more reset scenarios.

## Why don't we push intermediate progress?

Expand Down
4 changes: 2 additions & 2 deletions workflows-upstream-changes-into-fork.Rmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ Upon success, the main page of `YOU/REPO` shows something like
> This branch is up to date with `OWNER/REPO:main`.

If you have made commits on the default branch of your fork, which we [strongly advise against](#fork-dont-touch-main), this can result in a merge commit (or even merge conflicts).
If you are suffering due to commits you've made on `main` and it's beyond the help we describe below, consider deleting your fork and local repo and making a fresh start with [Fork and clone](fork-and-clone).
If you are suffering due to commits you've made on `main` and it's beyond the help we describe below, consider deleting your fork and local repo and making a fresh start with [Fork and clone](#fork-and-clone).
Live and learn.

Once you have successfully synced the default branch of `YOU/REPO` with the default branch of `OWNER/REPO`, you probably want to do the same for your local repo.
Expand Down Expand Up @@ -261,7 +261,7 @@ git reset --hard C

You will have to figure out how to convey `C` in Git-speak.
Specify it relative to `HEAD` or provide the SHA.
See *future link about time travel* for more support.
See [Time travel: See the past](#time-travel-see-past) for more support.

<!-- TODO: come back when there is content about referring to previous states. -->

Expand Down