Practice Yourself - Git Merge Conflicts

Code Editor bash

# Switch to main branch
git checkout main

# Merge feature branch into main
git merge feature-login

# If there are conflicts, resolve them then:
git add .
git commit -m "Resolve merge conflicts"

# Delete merged branch
git branch -d feature-login

Result

Click "Run" to execute the code...