Have you performed merge operations of changes from different branches in Git?

Yes, I have performed merging changes from different branches in Git using the git merge command. The process usually looks like this:

1. I switch to the target branch where I want to merge the changes, for example:

git checkout main

2. I merge with the desired branch:

git merge feature-branch

3. If conflicts arise, I resolve them manually by editing the files, then add the corrected files:

git add <files>

4. I complete the merge with a commit if necessary.

I also used git rebase for a cleaner history, but merge is the main way to combine changes.