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.
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!