moving
chirpy-starter
moving | chirpy-starter | |
---|---|---|
2 | 1 | |
798 | 441 | |
- | - | |
5.8 | 6.5 | |
8 months ago | 8 days ago | |
SCSS | Ruby | |
MIT License | MIT License |
Stars - the number of stars that a project has on GitHub. Growth - month over month growth in stars.
Activity is a relative number indicating how actively a project is being developed. Recent commits have higher weight than older ones.
For example, an activity of 9.0 indicates that a project is amongst the top 10% of the most actively developed projects that we are tracking.
moving
chirpy-starter
-
Dealing with Merge Conflicts and Upstream Branches (Git/GitHub)
I have added the starter template as an upstream branch - git remote add upstream https://github.com/cotes2020/chirpy-starter.git - but; obviously, there are 'no common commits' and I am unable to successfully merge the changes between the upstream and my local branch as the files will be different. (For example, the _config.yml, README.md, and Gemfile having conflicting changes).
What are some alternatives?
jekyll-theme-chirpy - A minimal, responsive, and feature-rich Jekyll theme for technical writing.
minima - Minima is a one-size-fits-all Jekyll theme for writers.
long-haul - A minimal, type-focused Jekyll theme.
affiliates-jekyll-theme - Affiliates - Jekyll Blogging Theme for Affiliate Marketers
jekyll-theme-hamilton - A minimal and beautiful Jekyll theme best for writing and note-taking.
website - This is moo's website. moo is a tech consultancy company that aims to solve tough problems with technology. We help our clients achieve technical excellence, strengthen their core technologies, scale with flexibility and create seamless digital experiences
henry-jekyll - Henry: Jekyll theme meant for a gorgeous reading experience and packed with features
libretto-book - :scroll: An updated version of the Libretto theme, tailored for hosting books
mediumish-theme-jekyll - Jekyll Template - Mediumish