ChaelCodes

$ git rebase -i origin/main  
error: cannot rebase: You have unstaged changes.
error: Please commit or stash them.
$ git rebase -i --autostash origin/main
Created autostash: c4d543d
Applied autostash.
Successfully rebased and updated refs/heads/docker-test-improvements.

ChaelCodes

Image 1 git status

On branch main
Your branch is up to date with 'origin/main'.

Changes to be committed:
  (use "git restore --staged <file>..." to unstage)
        modified:   _config.yml

Changes not staged for commit:

ChaelCodes

# frozen_string_literal: true

source 'https://rubygems.org'
git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }

ruby '2.7.8'

gem 'jekyll', '~> 4.2.0'
# This is the default theme for new Jekyll sites. You may change this to anything you like.
gem 'type-on-strap'

ChaelCodes

# frozen_string_literal: true

require "bundler/inline"

gemfile(true) do
  source "https://rubygems.org"

  gem "rails"
  # If you want to test against edge Rails replace the previous line with this:
  # gem "rails", github: "rails/rails", branch: "main"