By committing all of these together on master, we don't need to deal with a merge conflict of this file once staging/staging-next is merged together.
6.8 KiB
6.8 KiB
By committing all of these together on master, we don't need to deal with a merge conflict of this file once staging/staging-next is merged together.