Mykola Golubyev MykolaGolubyev

With the introduction of GitHub's Squash and Merge feature, this has become less prevelant, however it's still useful in scenarios where GitHub's interface is unavailable.

Let's talk through two ways to do a squash and merge on the command line.

Take 1: Interactive Rebase

When to use it

When you have not merged main into your feature branch
There are no merge conflicts

	import org.eclipse.jetty.server.Server;
	import org.eclipse.jetty.servlet.ServletHandler;
	import org.eclipse.jetty.servlets.ProxyServlet;

	import javax.servlet.ServletConfig;
	import javax.servlet.ServletException;
	import javax.servlet.ServletRequest;
	import javax.servlet.ServletResponse;
	import java.io.IOException;

	[Unit]
	Description=Demonstrate Bash

	[Service]
	ExecStartPre=/usr/bin/bash -c "/usr/bin/systemctl set-environment MYVAR=$(( 2 + 2 ))"
	ExecStart=/usr/bin/echo "2 + 2 = ${MYVAR}"

	<!DOCTYPE html>
	<html>
	<head>
	<title>My Iframe</title>
	</head>
	<body>

	<button>Botão</button>

	<script type="text/javascript">

	# The command finds the most recent tag that is reachable from a commit.
	# If the tag points to the commit, then only the tag is shown.
	# Otherwise, it suffixes the tag name with the number of additional commits on top of the tagged object
	# and the abbreviated object name of the most recent commit.
	git describe

	# With --abbrev set to 0, the command can be used to find the closest tagname without any suffix:
	git describe --abbrev=0

	# other examples


	// No Security

	{
	"rules": {
	".read": true,
	".write": true
	}
	}

	{
	"openapi": "3.0.2",
	"info": {
	"description": "This is a sample server Petstore server. You can find out more about Swagger at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/). For this sample, you can use the api key `special-key` to test the authorization filters.",
	"version": "1.0.0",
	"title": "Swagger Petstore",
	"termsOfService": "http://swagger.io/terms/",
	"contact": {
	"email": "[email protected]"
	},