Skip to content
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

Jump to bottom

fix: force checkout of Pages branch #544

Merged
merged 1 commit into from
Apr 2, 2022
Merged

fix: force checkout of Pages branch #544

merged 1 commit into from
Apr 2, 2022

Conversation

GriceTurrble
Copy link
Contributor

@GriceTurrble GriceTurrble commented Apr 1, 2022 •
edited
Loading

When using the theme starter, which uses a git submodule, assets loaded from that submodule are "untracked" files in the pages branch working tree. The build can fail at this line due to Git, saying "the following untracked working tree files would be overwritten by checkout".

Adding checkout -f forces the checkout, overwriting all files. The other deploy steps then take over and rewrite the files as needed.

Description

Type of change

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • Documentation update

How has this been tested

  • I have run bash ./tools/deploy.sh --dry-run (at the root of the project) locally and passed
  • I have tested this feature in the browser

Test Configuration

  • Browser type & version:
  • Operating system:
  • Ruby version:
  • Bundler version:
  • Jekyll version:

Checklist

  • I have performed a self-review of my code
  • I have commented on my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • My changes generate no new warnings

@GriceTurrble
fix: force checkout of Pages branch
207cb72 
When using the theme starter, which uses a git submodule,
assets loaded from that submodule are "untracked" files in the pages branch working tree.
The build can fail at this line due to Git, saying "the following untracked working tree files would be overwritten by checkout".

Adding `-f` forces the checkout, overwriting all files.
The other deploy steps then take over and rewrite the files as needed.
cotes2020
cotes2020 approved these changes Apr 2, 2022
View reviewed changes
Copy link
Owner

@cotes2020 cotes2020 left a comment

Choose a reason for hiding this comment

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

Thanks for the patch :)

@cotes2020 cotes2020 merged commit 5402523 into cotes2020:master Apr 2, 2022
@GriceTurrble GriceTurrble deleted the patch-1 branch April 2, 2022 23:27
linkliu pushed a commit to linkliu/game-tech-post-old that referenced this pull request Apr 10, 2022
@GriceTurrble @linkliu
fix: force checkout of gh-pages branch (cotes2020#544)
57b94a3 
When using the theme starter, which uses a git submodule,
assets loaded from that submodule are "untracked" files in the pages branch working tree.
The build can fail at this line due to Git, saying "the following untracked working tree files would be overwritten by checkout".

Adding `-f` forces the checkout, overwriting all files.
The other deploy steps then take over and rewrite the files as needed.

(cherry picked from commit 5402523)
@ivan-penchev ivan-penchev mentioned this pull request Jun 13, 2022
Merged
dkbnz pushed a commit to dkbnz/jekyll-theme-chirpy that referenced this pull request Jul 12, 2022
@GriceTurrble
fix: force checkout of gh-pages branch (cotes2020#544)
a38329d 
When using the theme starter, which uses a git submodule,
assets loaded from that submodule are "untracked" files in the pages branch working tree.
The build can fail at this line due to Git, saying "the following untracked working tree files would be overwritten by checkout".

Adding `-f` forces the checkout, overwriting all files.
The other deploy steps then take over and rewrite the files as needed.
shihtiy-tw pushed a commit to shihtiy-tw/shihtiy-tw.github.io that referenced this pull request Nov 26, 2022
@GriceTurrble @shihtiy-tw
fix: force checkout of gh-pages branch (cotes2020#544)
fd61d49 
When using the theme starter, which uses a git submodule,
assets loaded from that submodule are "untracked" files in the pages branch working tree.
The build can fail at this line due to Git, saying "the following untracked working tree files would be overwritten by checkout".

Adding `-f` forces the checkout, overwriting all files.
The other deploy steps then take over and rewrite the files as needed.
sanjidnet pushed a commit to sanjidnet/sanjidnet.github.io that referenced this pull request Jan 9, 2023
@GriceTurrble
fix: force checkout of gh-pages branch (cotes2020#544)
cc86572 
When using the theme starter, which uses a git submodule,
assets loaded from that submodule are "untracked" files in the pages branch working tree.
The build can fail at this line due to Git, saying "the following untracked working tree files would be overwritten by checkout".

Adding `-f` forces the checkout, overwriting all files.
The other deploy steps then take over and rewrite the files as needed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@cotes2020 cotes2020 cotes2020 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@GriceTurrble @cotes2020