Simon Golms SimonGolms

## convert-deploymentconfig-to-deployment.md

      
              1 file
            
          
              11 forks
            
          
              3 comments
            
          
              23 stars
            
          
                bmaupin
                / convert-deploymentconfig-to-deployment.md
            
            
              Last active
              November 29, 2023 08:24
            
              
                Convert OpenShift DeploymentConfig to Kubernetes Deployment
              
          
Change apiVersion from:
- apiVersion: v1
(or apiVersion: apps.openshift.io/v1)
to:


## how-to-squash-commits-in-git.md

      
              1 file
            
          
              81 forks
            
          
              18 comments
            
          
              383 stars
            
          
                patik
                / how-to-squash-commits-in-git.md
            
            
              Last active
              October 17, 2023 02:19
            
              
                How to squash commits in git
              
          
    Squashing Git Commits

The easy and flexible way

This method avoids merge conflicts if you have periodically pulled master into your branch. It also gives you the opportunity to squash into more than 1 commit, or to re-arrange your code into completely different commits (e.g. if you ended up working on three different features but the commits were not consecutive).
Note: You cannot use this method if you intend to open a pull request to merge your feature branch. This method requires committing directly to master.
Switch to the master branch and make sure you are up to date: