Dealing with Merge Conflicts and Upstream Branches (Git/GitHub)

This page summarizes the projects mentioned and recommended in the original post on /r/learnprogramming
jekyll-theme jekyll-site-starter jekyll-template site-template github-pages

InfluxDB - Power Real-Time Data Analytics at Scale
Get real-time insights from all types of time series data with InfluxDB. Ingest, query, and analyze billions of data points in real-time with unbounded cardinality.
www.influxdata.com
featured
SaaSHub - Software Alternatives and Reviews
SaaSHub helps you find the best software and product alternatives
www.saashub.com
featured

  • jekyll-theme-chirpy

    A minimal, responsive, and feature-rich Jekyll theme for technical writing.

    • I made a simple personal website using this Jekyll theme, generated from this template, and deployed in it using GitHub Pages. This repo was not generated from a fork.

  • chirpy-starter

    The startup template for Chirpy.

    • 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).

  • InfluxDB

    Power Real-Time Data Analytics at Scale. Get real-time insights from all types of time series data with InfluxDB. Ingest, query, and analyze billions of data points in real-time with unbounded cardinality.

    InfluxDB logo
NOTE: The number of mentions on this list indicates mentions on common posts plus user suggested alternatives. Hence, a higher number means a more popular project.

Suggest a related project

Related posts

  • I want to make a 3D roguelike with hexagons. So far I think I've figured out a coordinate system.

    1 project | /r/roguelikedev | 27 Feb 2021

  • Building OneFlow: Crafting an Effortless Jekyll Theme for One-Pager Websites

    2 projects | dev.to | 17 Feb 2024

  • [Help] Jekyll-chirpy theme, closely similar theme for hugo?

    1 project | /r/gohugo | 20 Nov 2023

  • Best place to document learnings

    1 project | /r/gamedev | 27 May 2023

  • A sort of multisite: any ideas?

    3 projects | /r/Jekyll | 2 Mar 2023