Merge vs Rebase - which is better to use?

Question

git

There is a common main branch, there is a personal feature / id. New commits are always pushed to feature/id.

There is a need to pull commits from the master. I see two options:

git rebase main
git push -f

git merge --squash main
git push

Which option is better to use? Are there other options? Like rebase,but don't likepush -f.

Answer 1

Vkusovschina, personally I like merge more. At least the fact that conflicts with the master can be fixed once without squats. With a rebase, fixing conflicts, especially if the same piece of code has changed more than once, is a pain. Now we have merging prohibited, there is only a rebase, and I suffer :(
Force push to my branch is the norm, there is nothing wrong with that.