My rule of thumb is rebase down, merge up
(ie rebase your main branch down onto a feature branch; merge your feature branch up to the main branch)
... except when the rebase is horrible and you are figuring out the same conflicts over and over... then merge down as well!
I tend to go with merge just for the extra verbosity, e.g. "that's when I brought master (i.e. main branch) onto my branch", and rebase to clean up dirt before pushing. It's not a sacred rule though, exceptions happen!
For further actions, you may consider blocking this person and/or reporting abuse
We're a place where coders share, stay up-to-date and grow their careers.
My rule of thumb is rebase down, merge up
(ie rebase your main branch down onto a feature branch; merge your feature branch up to the main branch)
... except when the rebase is horrible and you are figuring out the same conflicts over and over... then merge down as well!
neat and clean summary!
I tend to go with
mergejust for the extra verbosity, e.g. "that's when I broughtmaster(i.e. main branch) onto my branch", andrebaseto clean up dirt before pushing. It's not a sacred rule though, exceptions happen!