How to fix This branch has conflicts that must be resolved in Git

# Fetch the latest changes
git fetch origin

# See what files would conflict
git checkout your-branch
git merge origin/main --no-commit --no-ff

# If conflicts exist, git will list them
# Then abort to try a different approach
git merge --abort

<<<<<<< your-branch
Your code changes here
=======
Code from main branch here
>>>>>>> main

# Make sure you're on your feature branch
git checkout your-feature-branch

# Fetch the latest changes from remote
git fetch origin

# Merge the target branch into your branch
git merge origin/main

Auto-merging src/app.js
CONFLICT (content): Merge conflict in src/app.js
Automatic merge failed; fix conflicts and then commit the result.

# Open the conflicted file in your editor
# Look for and resolve conflict markers
# Save the file

# Stage the resolved file
git add src/app.js

# After all conflicts are resolved, commit
git commit -m "Merge main into feature-branch, resolve conflicts"

# Push the resolved branch to GitHub
git push origin your-feature-branch

# Make sure you're on your feature branch
git checkout your-feature-branch

# Fetch latest changes
git fetch origin

# Rebase your branch onto the target branch
git rebase origin/main

# Git will pause and show which files conflict
# Edit and fix each conflicted file
# Remove conflict markers and save

# Stage resolved files
git add src/app.js

# Continue the rebase
git rebase --continue

# If more conflicts occur, repeat the process
# If you want to abort and start over:
git rebase --abort

# Force push (required because rebase rewrites history)
git push --force-with-lease origin your-feature-branch

# Start the merge (if not already in progress)
git merge origin/main

# Launch the configured merge tool
git mergetool

# VS Code
git config --global merge.tool vscode
git config --global mergetool.vscode.cmd 'code --wait $MERGED'

# IntelliJ/WebStorm
git config --global merge.tool intellij
git config --global mergetool.intellij.cmd 'idea merge $LOCAL $REMOTE $BASE $MERGED'

# Other options: meld, kdiff3, vimdiff

git merge -X ours origin/main

git merge -X theirs origin/main

# Keep your version of a specific file
git checkout --ours path/to/file.js
git add path/to/file.js

# Keep their version of a specific file
git checkout --theirs path/to/file.js
git add path/to/file.js

# Check for any remaining conflict markers
grep -r "<<<<<<" . --include="*.js" --include="*.ts" --include="*.py"
grep -r "=======" . --include="*.js" --include="*.ts" --include="*.py"
grep -r ">>>>>>" . --include="*.js" --include="*.ts" --include="*.py"

# Run your test suite
npm test
# or
pytest
# or
go test ./...

# Build the project to check for compilation errors
npm run build

# If you used merge
git push origin your-feature-branch

# If you used rebase (requires force push)
git push --force-with-lease origin your-feature-branch

git fetch origin
git merge origin/main  # or git rebase origin/main
# Resolve any new conflicts
git push origin your-feature-branch