I want to postpone the conflict via script [closed]

Closed. This question needs detail开发者_运维问答s or clarity. It is not currently accepting answers.

---

Want to improve this question? Add details and clarify the problem by editing this post.

Closed 8 years ago.

Improve this question

I am writing wrappers for checkout and checkin. While checkout, I checkout the directory and lock the files mentioned or editing. But it may so happen that while checkout I get a conflict, I want to always postpone when conflict occurs, how can i do that via script

---

1. I assume that when you say 'checkout' you really mean 'update'.
2. You can't know if a conflict will occur before issuing the command.

3. If you read the output of svn help checkout it gives you the answer to how to always postpone:

     --accept ARG             : specify automatic conflict resolution action
                               ('postpone', 'base', 'mine-conflict',
                                'theirs-conflict', 'mine-full', 'theirs-full',
                                'edit', 'launch')
   

---

If you want to suppress all prompts during subversion operations you can also pass

--non-interactive        : do no interactive prompting