$ git add hello.rb $ git commit Recorded resolution for 'hello.rb'. [master 68e16e5] Merge branch 'i18n' You can see that it "Recorded resolution for FILE". Figure 161. Recorded resolution for FILE Now using git reset as we saw in Reset Demystified. $ git reset --hard HEAD^ HEAD is now at ad63f15 i18n the hello Our merge is undone. Now let’s rebase the topic branch. $ git checkout i18n-world Switched 'i18n-world' $ git rebase master First, rewinding head to replay your work on top of it... Applying: i18n one word Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge

$ git add hello.rb $ git commit Recorded resolution for 'hello.rb'. [master 68e16e5] Merge branch 'i18n' You can see that it "Recorded resolution for FILE". Figure 161. Recorded resolution for FILE Now by using git reset as we saw in Reset Demystified. $ git reset --hard HEAD^ HEAD is now at ad63f15 i18n the hello Our merge is undone. Now let’s rebase the topic branch. $ git checkout i18n-world Switched 'i18n-world' $ git rebase master First, rewinding head to replay your work on top of it... Applying: i18n one word Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge

$ git add hello.rb $ git commit Recorded resolution for 'hello.rb'. [master 68e16e5] Merge branch 'i18n' You can see that it "Recorded resolution for FILE". Figure 161. Recorded resolution for FILE Now using git reset as we saw in Reset Demystified. $ git reset --hard HEAD^ HEAD is now at ad63f15 i18n the hello Our merge is undone. Now let’s rebase the topic branch. $ git checkout i18n-world Switched 'i18n-world' $ git rebase master First, rewinding head to replay your work on top of it... Applying: i18n one word Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge

Merge branch 'i18n' 可以看到它 "Recorded resolution for FILE"。 现在，让我们撤消那个合并然后将它变基到 master 分支顶部来替代它。 可以通过使用之前在 重置揭密 看到的 git reset 来回滚分支。 $ git reset --hard HEAD^ HEAD is now at ad63f15 i18n the hello 我们的合并被撤消了。 'i18n-world' $ git rebase master First, rewinding head to replay your work on top of it... Applying: i18n one word Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge Resolved 'hello.rb' using previous resolution. Failed to merge in the changes. Patch failed at 0001 i18n one word 现在，正像我们期望的一样，得到了相同的合并冲突，但是看一下 Resolved FILE using previous resolution 这行。 如果我们看这个文件，会发现

Merge branch 'i18n' 可以看到它 "Recorded resolution for FILE"。 现在，让我们撤消那个合并然后将它变基到 master 分支顶部来替代它。 可以 通过使用之前在 重置揭密 看到的 git reset 来回滚分支。 $ git reset --hard HEAD^ HEAD is now at ad63f15 i18n the hello 我们的合并被撤消了。 'i18n-world' $ git rebase master First, rewinding head to replay your work on top of it... Applying: i18n one word Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge Resolved 'hello.rb' using previous resolution. Failed to merge in the changes. Patch failed at 0001 i18n one word 现在，正像我们期望的一样，得到了相同的合并冲突，但是看一下 Resolved FILE using previous resolution 这行。 如果我们看这个文件，会发现它已

--embedded --safe-mode=secure --out-file=- -" 6. IS_INPUT_FILE = false ENABLED：false 设置是否启动渲染器 i18n ( i18n ) Markup ( markup ) 配置说明 - 115 - 本文档使用 书栈网 · BookStack.CN 构建 NEED_POSTPROCESS：true 设置为true以替换链接/SHA1等。