在 perforce 上签入文件
假设我有一个名为 example.vcproj 的项目，我已向其中添加了文件： 1.first_file.c 2. secondary_file.c
first_file.c 是 10 天前添加的，尚未经过代码审查。因此我仍在等待，目前我无法签入文件。
Second_file.c 最近被添加。它已经通过了代码审查并准备好签入。但是，由于我的第一个文件仍在审查中，我无法继续提交第二个文件，主要是因为对 example.vcproj 的依赖。
请让我知道解决此冲突的最简单方法，而不是暂时删除 first_file.c 并恢复 example.vcproj 并检查最近的更改。谢谢。
Say, I have a project called example.vcproj to which I have added files:
1. first_file.c
2. second_file.c
first_file.c was added 10 days ago and has still not been code reviewed. Therefore I am still waiting for it and at this moment I cannot check in the files.
second_file.c was added recently. It has gone through the code review and is ready to be checked in. However since my first file is still on review, I am not able to go ahead and submit the second one, mainly because of the dependency on example.vcproj.
Please let me know the simplest way to resolve this conflict other than temporarily removing the first_file.c and reverting the example.vcproj and checking in the most recent changes. Thanks.
如果你对这篇内容有疑问，欢迎到本站社区发帖提问 参与讨论，获取更多帮助，或者扫码二维码加入 Web 技术交流群。
绑定邮箱获取回复消息
由于您还没有绑定你的真实邮箱，如果其他用户或者作者回复了您的评论，将不能在第一时间通知您！
发布评论
评论（1）
您可以尝试以下几件事。
首先，您可以在提交之前搁置所有文件。这至少意味着您不会有丢失任何工作的危险，因为文件将存储在 Perforce 服务器上。收到代码审查后，您可以签入它们。
其次，您可以为正在进行的工作创建私有分支或流。然后，每当您在私有分支上达到稳定的里程碑时，您就可以获得代码审查批准并将其提升到共享分支。
There are a couple of things you can try.
First, you can shelve all of your files prior to submit. That at least means you are in no danger of losing any work, as the files will be stored on the Perforce server. After you receive code review you can check them in.
Second, you can create a private branch or stream for your work-in-progress. Then whenever you hit a stable milestone on your private branch, you can get code review approval and promote it to the shared branch.