|
|
|
|
|
|
by jpgrayson
1854 days ago
|
|
|
StGit maintainer here. You are correct that conflicts can occur when pushing or reordering patches. These conflicts are resolved with the regular git mechanisms. I.e. conflict markers in files, use `git add` to mark conflicts as resolved, and then `stg refresh` to update the patch with conflicts resolved. |
|
|