Martin von Zweigbergk ea05f8f1e5 cli: prevent pushing commits with conflicts ... It rarely makes sense to push commits with conflicts to a remote Git repo (which is the only kind of remote we support so far), so let's just error out instead of pushing a commit that others pulling from the remote probably can't make sense of. I've only added a simple test for the error case for now. `libgit2` doesn't support pushing to a local repo, so it's harder to test the success case. I suppose we'll have to have the regular `git` binary running local servers in test eventually. Closes #60.		2022-03-10 12:38:07 -08:00
..
smoke_test.rs	tests: set user and email in e2e tests	2022-03-10 12:38:07 -08:00
test_git_push.rs	cli: prevent pushing commits with conflicts	2022-03-10 12:38:07 -08:00
test_global_opts.rs	tests: set user and email in e2e tests	2022-03-10 12:38:07 -08:00
test_init_command.rs	cli: on jj init --git-repo=., use relative path to .git/	2022-03-05 09:37:48 -08:00
test_ui.rs	cli: parse file names as relative and using platform separator	2021-06-09 22:56:02 -07:00
test_untrack_command.rs	cli: clarify error message when jj untrack argument is not ignored	2022-03-02 22:43:09 -08:00