Micah Rairdon Tiberriver256

## merge_vs_rebase_vs_squash.md

      
              1 file
            
          
              6 forks
            
          
              3 comments
            
          
              196 stars
            
          
                mitchellh
                / merge_vs_rebase_vs_squash.md
            
            
              Last active
              April 22, 2024 16:22
            
              
                Merge vs. Rebase vs. Squash
              
          
    I get asked pretty regularly what my opinion is on merge commits vs rebasing vs squashing.
I've typed up this response so many times that I've decided to just put it in a gist so
I can reference it whenever it comes up again.

I use merge, squash, rebase all situationally. I believe they all have their merits
but their usage depends on the context. I think anyone who says any particular strategy
is the right answer 100% of the time is wrong, but I think there is considerable
acceptable leeway in when you use each. What follows is my personal and professional
opinion:


## PSWebServer.psm1
Function New-PSWebServer {

    <#
 .Synopsis
 Creates a web server that will invoke PowerShell code based on routes being asked for by the client.

 .Description
 New-PSWebServer creates a web server.  The web server is composed of a schema that defines the client's requests to routes where PowerShell code is executed.

 Under the covers, New-PSWebServer uses the HTTPListener .NET class to execute powershell code as requested, retrieves the results and sends data back through the httplistener web server framework.

## 01.md

      
              3 files
            
          
              0 forks
            
          
              19 comments
            
          
              40 stars
            
          
                AlbertoMonteiro
                / 01.md
            
            
              Last active
              January 23, 2024 10:11
            
              
                Migration from Moq to NSubstitute
              
          
    Migrated to https://github.com/AlbertoMonteiro/moq-to-nsubstitute/tree/main
	Function New-PSWebServer {

	<#
	.Synopsis
	Creates a web server that will invoke PowerShell code based on routes being asked for by the client.

	.Description
	New-PSWebServer creates a web server. The web server is composed of a schema that defines the client's requests to routes where PowerShell code is executed.

	Under the covers, New-PSWebServer uses the HTTPListener .NET class to execute powershell code as requested, retrieves the results and sends data back through the httplistener web server framework.