fix: Clarify resolving merge conflicts section

[BekahHW]

          This page is using a closed PR as an example and gives instructions based on the PR.

Currently, it's a little bit difficult to understand what's going on here. For example, we have a "Repository Setup" section, which I think is not necessary here (the open-sauced repo that is used here also has been archived).

We might want to consider to re-write/simplify this section. Think of having these:

• Why merge conflicts commonly happen in the OpenSauced repos (maybe mention the repos?) --> This is explained in the 1st sentence of the intro.
• How to update branches (origin and local) section.
• How to resolve conflicts section — including commit and push changes.
• More simple and general technical examples.
• Keep the Dependency Updates section.

---

docs/docs/contributing/technical/resolve-merge-conflicts.md

Lines 50 to 59 in 6214d00

	## Update
	First, get the default branch changes:
	```shell
	git fetch origin --recurse-submodules=no --progress --prune
	git checkout main --
	git fetch upstream --recurse-submodules=no --progress --prune
	git merge upstream/main --no-stat -v
	```

• We might want to change the title to "Updating Local Branch".
• Looking at the commands, this instruction is updating and merging the upstream with the local main branch. We might want to use working branch as instruction instead of main for best practice.
• There is a separate section to merge branches, but we have a command to merge here: git merge upstream/main --no-stat -v.
• Is the git merge command above the same with below command from the next section, "Merge with upstream"? If not, then we are having different merging instruction.

docs/docs/contributing/technical/resolve-merge-conflicts.md

Line 66 in 6214d00

git merge origin/main --no-ff -v

Originally posted by @adiati98 in #213 (comment)

[github-actions]

🎉 This issue has been resolved in version 1.57.1 🎉

The release is available on:

• GitHub release
• ghcr.io container (@latest dist-tag)

Your semantic-release bot 📦🚀