Skip to content

Conversation

@Dindihub
Copy link
Contributor

@Dindihub Dindihub commented Sep 5, 2024

Added aliases to content pages to cover issue Dindihub/docsy-tuf.io#14

Please review @chalin

Signed-off-by: sandra <sadindi03@gmail.com>
Copy link
Collaborator

@chalin chalin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is the docsy theme being updated? This shouldn't happen if you're working from docsy at HEAD.

Oh, it seems that you pushed directly to the docsy branch in your local repo. You need to create a branch with another name in your local repo, otherwise you'll lose access to the upstream docsy.

Please resubmit your PR, but do so from a local branch that has a name other than docsy.

Overall this PR seems ok, though I'll review it in more detail after.

@Dindihub
Copy link
Contributor Author

Dindihub commented Sep 5, 2024

Why is the docsy theme being updated? This shouldn't happen if you're working from docsy at HEAD.

Oh, it seems that you pushed directly to the docsy branch in your local repo. You need to create a branch with another name in your local repo, otherwise you'll lose access to the upstream docsy.

Please resubmit your PR, but do so from a local branch that has a name other than docsy.

Overall this PR seems ok, though I'll review it in more detail after.

@chalin Makes sense. Is there any way I can reverse the update to the themes/docsy? It's now being tracked by all my branches.

@chalin
Copy link
Collaborator

chalin commented Sep 5, 2024

@chalin Makes sense. Is there any way I can reverse the update to the themes/docsy? It's now being tracked by all my branches.

The problem isn't the Docsy theme commit -- the commit in this PR is the correct commit. The problem is that this PR is showing a Docsy theme commit as a change. This is likely happening because you created this PR based on the docsy branch, but forgot to pull the latest commits first.

Please resubmit your PR, but do so from a local branch that has a name other than docsy.

The previous statement is important.

Note that before you create the new branch, refresh your local docsy branch using the commands I gave you the other day via https://cloud-native.slack.com/archives/C078K0K0KND/p1725496247026039?thread_ts=1725495858.968089&cid=C078K0K0KND, namely:

git fetch --all --prune --tags
git switch docsy
git rebase upstream/docsy
git push origin

(I get the impression that you might have done this already, because #77 seems to be ok -- i.e., not showing an update to the docsy theme.)

@Dindihub
Copy link
Contributor Author

Dindihub commented Sep 5, 2024

@chalin Makes sense. Is there any way I can reverse the update to the themes/docsy? It's now being tracked by all my branches.

The problem isn't the Docsy theme commit -- the commit in this PR is the correct commit. The problem is that this PR is showing a Docsy theme commit as a change. This is likely happening because you created this PR based on the docsy branch, but forgot to pull the latest commits first.

Please resubmit your PR, but do so from a local branch that has a name other than docsy.

The previous statement is important.

Note that before you create the new branch, refresh your local docsy branch using the commands I gave you the other day via https://cloud-native.slack.com/archives/C078K0K0KND/p1725496247026039?thread_ts=1725495858.968089&cid=C078K0K0KND, namely:

git fetch --all --prune --tags
git switch docsy
git rebase upstream/docsy
git push origin

(I get the impression that you might have done this already, because #77 seems to be ok -- i.e., not showing an update to the docsy theme.)

@chalin Right i did use those commands. Like you mentioned, problem was making commits on my local docsy branch . I'll resubmit the PR. Thanks

@chalin
Copy link
Collaborator

chalin commented Oct 3, 2024

Closed by #78

@chalin chalin closed this Oct 3, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants