Skip to main content

All Questions

0 votes
2 answers
497 views

squash hundreds of commits and rebase kicks off a large conflict resolution

I have a "long lived feature" branch that i have been working for last 2 months. It has 211 commits that i want to squash into single commit before this "long lived feature branch" ...
ASy_Dev's user avatar
  • 11
-1 votes
1 answer
876 views

Azure Devops Git Squash-Commit Issue fake commits

my company is currently working on Azure Cloud, managing our code repositories using Azure Devops and Git. For some months we decided to use the Squash-commit when we wanted to merge our feature ...
Alessio Orlando's user avatar