YOU SAID:
An initial attempt of is made to make a simple merge automatically. If this fails the merge method decide if manual merge too will be spawned of not.
INTO JAPANESE
の最初の試みは、単純なマージを自動的に行うことです。これが失敗した場合、マージ方法は手動マージも生成されるかどうかを決定します。
BACK INTO ENGLISH
The first attempt is to do a simple merge automatically. If this fails, the merge method determines whether a manual merge is also generated.
INTO JAPANESE
最初の試みは、単純なマージを自動的に行うことです。これが失敗した場合、マージメソッドは手動マージも生成されるかどうかを決定します。
BACK INTO ENGLISH
The first attempt is to do a simple merge automatically. If this fails, the merge method determines whether a manual merge is also generated.
You've done this before, haven't you.