$ git fetch upstream
$ git fetch origin
$ git checkout feature-branch
$ git rebase origin/feature-branch
$ git rebase upstream/mainOh noes! A merge conflict appears here!
| 'use strict' | |
| const { parentPort, workerData } = require('worker_threads') | |
| const individualTrack = require('music-routes-data/data/individual_track.json') | |
| const tracks = [] | |
| const individuals = [] | |
| const { id, index } = workerData |
$ git fetch upstream
$ git fetch origin
$ git checkout feature-branch
$ git rebase origin/feature-branch
$ git rebase upstream/mainOh noes! A merge conflict appears here!