My new year resolution would be to never solve the merge conflicts again
Just drive a new branch from upstream and yank everything
Just drive a new branch from upstream and yank everything
> "we are a family"
> announces firing of entire design and marketing team in same meet
> announces firing of entire design and marketing team in same meet