谁能给我一个使用 Git 的良好翻译工作流程的示例？
我在某处读到过（我不记得具体在哪里），当你翻译一些文本时，Git（可能还有其他好的 DCVS）是一个很好的工具。
我正在尝试找出这种情况的工作流程，我能得到的最好的结果是：
- 使用你自己的分支。 像往常一样翻译文件，根据需要提交。
- 当上游有更改时，将它们合并到您自己的分支中。
- 解决合并问题（这些问题应该出现在添加文本的所有地方，因为您可能翻译了所有文本）
因此，在由合并标记的文件中，应该很容易找到（使用>>标记）变化是。 不管怎样，我想我可能没有抓住要点，我什至不确定当在先前更改的文件的一部分中发现更改并且您先前标记为合并时会发生什么。
谢谢。
**编辑：**好吧，有人指出（在评论中）问题本身不清楚。 具体来说，我想知道的是这个工作流程是否正确，或者是否有一种（或多种）方法可以做得更好。
I've read somewhere (I dont recall exactly where) that Git (and probably any other good DCVS) is an excellent tool when you're translating some text.
I'm trying to figure out a workflow for this scenario, and the best I could get was something like:
- Use your own branch. Translate files as usual, commit as needed.
- When there are changes upstream, merge them with your own branch.
- Resolve the merge problems (those should be everywhere a text was added, since you probably translated all the text)
So, in the files marked by the merge, it should be easy to find out (with >>> markings) where the changes are. Anyway, I think I may be missing the point, and I'm even not sure about what happens when a change is found in a part of the file that was previously changed, and you previously marked as merged.
Thanks.
**Edit:**Ok, someone pointed out (in the comments) that the question itself wasn't clear. So specifically, what I want to know is if this workflow is correct, or if there is one (or more) way to do it better.
如果你对这篇内容有疑问，欢迎到本站社区发帖提问 参与讨论，获取更多帮助，或者扫码二维码加入 Web 技术交流群。
绑定邮箱获取回复消息
由于您还没有绑定你的真实邮箱，如果其他用户或者作者回复了您的评论，将不能在第一时间通知您！
发布评论
评论（1）
好吧，我有一个应用程序，我一直在维护两个分支来将其本地化，让我告诉你，它很快就不再有趣了。
有一点帮助的一件事是将可本地化的字符串包含在自己的行中，以确保不会出现不必要的冲突。
但最终，真正的方法是拥有一些 m17n 框架并拥有单独的本地化文件。 四处分支并没有多大规模。
Well, I have one app that I've been maintaining two branches to localize it like that, and let me tell you, it stops being fun really soon.
One thing that helps a bit is containing the localizable strings to their own lines, to ensure you don't get unnecessary conflicts.
But in the end, the real way to go is to have some m17n framework and have separate files for localization. Branching around doesn't quite scale.