1

18 votes

1 Answer

1 answer by User123424 22h git merge conflict

Use Git's merge tool.

---

git add .

Use git status to show unmerged files.
git commit -m "merge branch"
git push origin main


git merge class="text-blue-700"