Can you describe the main stages and methods of software development used at your previous workplace?

In our company, the process of merging (merge) and rebasing (rebase) is organized considering team convenience and maintaining a clean commit history.

Developers usually work in separate feature branches. Before merging into the main branch (e.g., main or develop), they rebase their branch onto the current HEAD of the main branch. This allows integrating the latest changes and avoiding conflicts.

After a successful rebase and code review, the branch is merged via fast-forward or squash merge to keep the history clear and linear.

This approach helps to:

• Minimize merge conflicts
• Maintain a clean and readable commit history
• Ensure transparency of changes through code review

Example commands:

# Update local main branch
git checkout main
git pull origin main

# Switch to feature branch
git checkout feature-branch

# Rebase onto main
git rebase main

# Resolve conflicts if any

# Switch back to main and merge
git checkout main
git merge feature-branch

# Push changes to remote repository
git push origin main

This process helps to keep the codebase organized and of high quality.