3 ms·
This was a nice document. But could you expand what happens after step 4 of your last workflow if you get a conflict with the rebase? You say: > and then t
by whartung 3y ago
This was a nice document. But could you expand what happens after step 4 of your last workflow if you get a conflict with the rebase? You say:
> and then tell git to continue attempting to apply your changes.
Sorry, I just don’t know what that means. Redo step 4? Does rebase fail on the first conflict? It seems that when you get a rebase conflict your in the middle of a process but dumped to the command line. It’s not clear how you move forward (I guess repeat step 4) but more importantly how do you go back to the start before you did step 4?
- PaulDavisThe1st 3y agoso, you run git rebase master and get a conflict report. You fire up your preferred editor/IDE/whatever on the files that have conflicts, and you fix the conflicts, either by picking one of the versions (they will be marked sections delimited by <<<< and >>>>) or by manually merging the versions into a single new version. You save those files back to disk. Then you run git add ... list of files with conflicts that are now fixed ... and then you run git rebase continue You may have to repeat this process multiple times before the rebase can complete.