johnypony3

## git-squash.md

      
        
          
            
              
              1 file
            
          
          
            
              
              0 forks
            
          
          
            
              
              0 comments
            
          
          
            
              
              2 stars
            
          
        
        
          
              
          
          
            
                johnypony3
                / git-squash.md
            
            
              Last active
              April 4, 2022 11:05
            
          
        
      
        
  
      
    Squashing commits the easy way

Rewriting history is only safe if no one depends on your branch.

So for example never do this on parent branches ie: develop, master, a feature branch with child branches, etc.

Example workflow:

Make feature branch
Haxxor
Push to origin (optional but your dentist recommends you floss)
Repeat steps 2 - 3 as necessary
Squash commits using the function in this article