jelc53 · February 25, 2026 10:50
diff --git a/squash_and_rebase.txt b/squash_and_rebase.txt
  Here's how to squash and cleanly rebase against upstream branch:                                                
                                                                                          
  # 1. Soft reset to the merge-base (keeps your changes staged)                           
  git reset --soft $(git merge-base main HEAD)                                            
                                                                                          
  # 2. Commit everything as one squashed commit                                           
  git commit -m "Your squashed commit message"                                            
                                                                                          
  # 3. Rebase onto current main                                                           
  git rebase main   # resolve merge conflicts once
  git push --force-with-lease
	Here's how to squash and cleanly rebase against upstream branch:

	# 1. Soft reset to the merge-base (keeps your changes staged)
	git reset --soft $(git merge-base main HEAD)

	# 2. Commit everything as one squashed commit
	git commit -m "Your squashed commit message"

	# 3. Rebase onto current main
	git rebase main # resolve merge conflicts once
	git push --force-with-lease
No results found