3 ms·
That sounds extremely useful, indeed. What are the caveats/corner cases? I assume it does a lot of debasing behind the scenes, what happens in case if conflicts
by choeger 5y ago
That sounds extremely useful, indeed. What are the caveats/corner cases? I assume it does a lot of debasing behind the scenes, what happens in case if conflicts?
- jpgrayson 5y agoStGit 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.