We are using FTOptix and Azure lost work?

If the branch was already pushed and shared, the safest way to go back 5 commits without rewriting repo history is to revert the unwanted commits, not reset or rebase.

Recommended for a shared Azure Repo

1. Find the commit IDs:

      git log --oneline
   

2. Identify the last good commit from 5 commits ago.
3. Revert the commits after that point, one by one, using:

      git revert <commit ID>
   

   This creates new commits that undo the changes while keeping history intact.
4. If Git reports conflicts, resolve them, then run:

      git revert --continue
   

   Or cancel with:

      git revert --abort
   

5. Push the new revert commits to Azure Repos.

Visual Studio 2022

1. Go to Git > View Branch History.
2. In History, right-click each commit to undo.
3. Select Revert.

If the branch is not shared A reset is possible, but it changes branch history.

• Keep later changes as local unstaged changes:

    git reset --mixed <commit ID>
  

• Discard all changes after that commit:

    git reset --hard <commit ID>
  

git reset --hard can permanently discard work. Do not use reset to an older commit on a branch that has already been pushed and shared with others, because local and remote history will no longer match.

About force push / rebase Rebase and force push can overwrite the server branch, but this is risky and can cause lost work. It also requires Force push or Admin permissions on the repository. This approach should be used with caution.

• Undo changes
• Undo changes
• Remove a large binary from your Git history to manage the size of cloned repositories