stg new foo -m foo &&
echo foo > test &&
echo fie > test2 &&
- git add test test2 &&
+ stg add test test2 &&
stg refresh &&
stg pop
'
'
stg new bar -m bar &&
echo bar > test &&
- git add test &&
+ stg add test &&
stg refresh
'
test_expect_success \
'Push the first patch with conflict' \
'
- ! stg push foo
+ conflict stg push foo
'
test_expect_success \
test_expect_success \
'Check that pop will fail while there are unmerged conflicts' \
'
- ! stg pop
+ command_error stg pop
'
test_expect_success \
'Resolve the conflict' \
'
echo resolved > test &&
- git add test &&
+ stg resolved test &&
stg refresh
'