Garry Tan and capy-ai[bot]
f557988ea1
v1.95.2.0 pregate: conflict-markers guard refuses merge markers on added lines (GST-1190) ( #3965 )
...
* pregate: a conflict-markers guard refuses merge markers on the lines a branch adds (GST-1190)
Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com>
* fix(pregate): conflict-markers reads the pushed commit, fixed git prefixes and real declarations
Review fixes for GST-1190: read HEAD and the working tree, force a/ b/ prefixes and unquoted paths,
skip untracked files, require the fixture declaration on its own line near the top, refuse conflicts
inside code fences in Markdown, run the test spawn through bunIsolationArgs for Windows.
Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com>
* test(conflict-markers): type the git config env rows
Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com>
---------
Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com>
2026-11-04 00:18:18 +00:00
..
2026-04-04 10:17:05 -07:00
2026-11-03 15:04:56 +00:00
2026-11-04 00:03:30 +00:00
2026-11-03 19:49:58 +00:00
2026-11-02 03:11:57 +00:00
2026-10-20 00:24:28 +00:00
2026-04-18 15:05:42 +08:00
2026-09-29 08:58:49 -07:00
2026-10-20 00:24:28 +00:00
2026-10-04 07:58:41 -07:00
2026-10-26 04:32:27 +00:00
2026-10-08 16:17:18 +00:00
2026-11-03 15:04:56 +00:00
2026-10-20 00:24:28 +00:00
2026-10-20 00:24:28 +00:00
2026-11-04 00:18:18 +00:00
2026-11-03 19:58:43 +00:00
2026-10-31 06:07:36 +00:00
2026-10-20 00:24:28 +00:00
2026-10-11 01:18:11 +00:00
2026-10-20 00:24:28 +00:00
2026-10-17 17:19:52 +00:00
2026-10-20 00:24:28 +00:00
2026-10-31 18:12:53 +00:00
2026-10-20 00:24:28 +00:00
2026-10-20 00:24:28 +00:00
2026-10-21 19:22:49 +00:00
2026-10-21 19:22:49 +00:00
2026-10-05 10:00:47 -07:00
2026-10-05 10:00:47 -07:00
2026-10-20 00:24:28 +00:00
2026-10-20 00:24:28 +00:00
2026-10-20 00:24:28 +00:00
2026-10-20 00:24:28 +00:00
2026-10-01 11:57:48 -07:00
2026-10-20 00:24:28 +00:00
2026-10-20 00:24:28 +00:00
2026-09-22 14:57:52 -04:00
2026-10-19 18:26:20 +00:00
2026-10-25 21:33:43 +00:00
2026-10-20 00:24:28 +00:00
2026-10-20 00:24:28 +00:00
2026-10-01 13:55:16 -07:00
2026-10-20 00:24:28 +00:00
2026-10-27 15:11:13 +00:00
2026-10-20 00:24:28 +00:00
2026-10-20 00:24:28 +00:00
2026-10-20 00:24:28 +00:00
2026-10-20 00:24:28 +00:00
2026-09-26 18:57:53 -04:00
2026-11-01 14:23:49 +00:00
2026-11-01 14:23:49 +00:00
2026-10-19 15:17:57 +00:00
2026-10-20 00:24:28 +00:00
2026-10-20 00:24:28 +00:00
2026-10-10 22:33:01 +00:00
2026-10-20 04:47:11 +00:00
2026-10-27 13:28:18 +00:00
2026-10-20 00:24:28 +00:00
2026-10-29 04:22:41 +00:00
2026-10-11 01:57:16 +00:00
2026-11-02 18:05:23 +00:00
2026-05-29 08:35:00 -07:00
2026-11-03 15:04:56 +00:00
2026-10-20 00:24:28 +00:00
2026-10-29 13:28:08 +00:00
2026-04-18 15:05:42 +08:00
2026-10-26 06:55:30 +00:00
2026-10-31 22:41:36 +00:00
2026-10-20 00:24:28 +00:00
2026-10-20 00:24:28 +00:00
2026-10-08 08:00:08 +00:00
2026-10-19 07:26:49 +00:00
2026-11-02 14:49:46 +00:00
2026-11-02 18:05:23 +00:00
2026-11-02 14:49:46 +00:00
2026-11-02 14:49:46 +00:00
2026-08-08 09:28:45 -07:00
2026-11-01 06:11:17 +00:00
2026-11-02 14:49:46 +00:00
2026-11-02 17:44:00 +00:00
2026-10-20 00:24:28 +00:00
2026-10-20 00:24:28 +00:00
2026-11-02 16:20:02 +00:00
2026-11-02 16:20:02 +00:00
2026-11-03 01:40:07 +00:00
2026-10-20 02:13:39 +00:00
2026-10-28 09:59:40 +00:00
2026-10-18 01:22:15 +00:00
2026-10-20 00:24:28 +00:00
2026-10-20 00:24:28 +00:00
2026-11-03 18:22:59 +00:00
2026-08-29 10:10:35 -07:00
2026-04-18 15:05:42 +08:00
2026-10-07 14:00:06 +00:00
2026-10-20 00:24:28 +00:00
2026-10-28 00:27:22 +00:00
2026-10-28 02:58:29 +00:00
2026-10-27 13:28:18 +00:00
2026-10-20 00:24:28 +00:00
2026-11-02 19:11:00 +00:00
2026-11-02 05:24:30 +00:00
2026-10-23 18:05:39 +00:00
2026-11-03 08:43:28 +00:00
2026-10-01 11:57:48 -07:00
2026-10-30 19:23:01 +00:00
2026-10-30 19:23:01 +00:00
2026-11-03 18:34:14 +00:00
2026-10-20 00:24:28 +00:00
2026-05-20 07:35:01 -07:00