Commit Graph

15 Commits

Author SHA1 Message Date
Nick Tobey fb60b05990 Add bats test for pulling changes in the presence of changes to ignored tables. 2024-06-07 14:26:18 -07:00
Neil Macneale IV e1f533fc8c Allow dolt pull to survive conflicts 2024-03-27 16:54:46 -07:00
Stephanie You ab4e12c023 add --silent option for push, pull, fetch 2023-10-18 15:48:30 -07:00
jennifersp c107df2bc2 add --all flag for dolt push (#6787) 2023-10-14 12:36:25 -07:00
Stephanie You fa50b5ba78 address PR comments 2023-10-13 12:39:54 -07:00
Stephanie You 961cdfbd4f address PR comments 2023-10-13 01:15:41 -07:00
Stephanie You 871fab1546 update bats tests 2023-10-13 01:12:59 -07:00
Stephanie You 4f6e198558 address PR comments 2023-10-09 14:04:27 -07:00
Stephanie You d8c6d56bce more pull options bats tests 2023-10-09 13:17:41 -07:00
Stephanie You aef2d199b4 unskip dolt pull --squash test 2023-10-09 10:29:29 -07:00
Stephanie You 5ca6a19962 fix dolt pull --force to work properly 2023-10-08 20:55:19 -07:00
Stephanie You 60bcded65f update merge to return 1 when there are conflicts 2023-10-04 18:53:58 -07:00
Stephanie You 039f0221dc update pull to print proper merge stats 2023-10-04 18:53:58 -07:00
Stephanie You d6ab22bee7 migrate dolt pull to use sql queries 2023-10-04 18:53:58 -07:00
Stephanie You 0a47b6f90a add bats tests for pull 2023-10-04 18:53:58 -07:00