Closed jhuang739 closed 3 years ago
resolve conflicts -> you can sync changes by pulling from master then pushing upstream again
resolve conflicts -> you can sync changes by pulling from master then pushing upstream again