question

newuser-627175c1-8210-4dec-a1b7-23da0b90bb08 avatar image

How to update pull merge from ask cli

Hi we are two programmers and I have created the project with ask new and the second programmer cloned the project -- that worked already fine. When I am deploying the code and the second one is doing something else on his local code there is a conflict, when he tries to deploy. Is there a possibility to update/pull the code from remote or to merge the code ?

We really need help, thanks in advance ...

how-toask cliupdate
10 |5000

Up to 2 attachments (including images) can be used with a maximum of 512.0 KiB each and 1.0 MiB total.

1 Answer

Anand@Amazon avatar image
Anand@Amazon answered

Hello Developer,

You can use ask diff command to find out the difference and if first programmer already deployed his changes then you can run ask api get-model command to get the latest interaction model. If you are getting error due to different Etag then run ask api head-model command to get the latest Etag and same you can update in your skill.

2 comments
10 |5000

Up to 2 attachments (including images) can be used with a maximum of 512.0 KiB each and 1.0 MiB total.

Once we get the Etag - what do we do with it? Just copy/paste it into .ask/config?

0 Likes 0 ·
Anand@Amazon avatar image Anand@Amazon ♦ newuser-bf7f815f-58c0-4e8a-a258-3e52a928db6e commented ·

Yeah, just update Etag in .ask/config file and deploy again.

0 Likes 0 ·