Steps to Update Your Feature Branch with git merge

[gurmehak]

Steps to Update Your Feature Branch with git merge
Switch to your feature branch:
git checkout feature-branch
Fetch the latest changes from the remote repository:
git fetch origin
Merge the updated develop branch into your feature branch:
git merge origin/develop
Resolve conflicts if they occur:
Open the conflicted files. Look for conflict markers like <<<<<<<, =======, and >>>>>>>.
Edit the files to resolve conflicts by keeping the desired changes.
After resolving, stage the resolved files:
git add
Complete the merge:
git commit
Push your updated feature branch to the remote repository (if needed):
git push origin feature-branch