atom/github

When viewing undo discard conflicts in a new file, set path to project folder

Open

#601 创建于 2017年3月7日

在 GitHub 查看
 (1 评论) (0 反应) (0 负责人)JavaScript (1,069 star) (469 fork)batch import
gitgood first issue

描述

Currently we open the conflict file from the temporary folder. Instead we should create a new editor with the path set to /my/project/path/~file-under-conflict.txt (with a ~ to distinguish it from the original file) and setText to be the contents of the file in the temp folder.

Versions

GitHub Package Version (git --git-dir ~/.atom/packages/github/.git rev-parse head): 45e4e18cb7d44b7270dba6c092a2e1332868d8fe

贡献者指南

技术栈
javascript
领域
desktop
议题类型
feature
难度面向新贡献者的预计实现难度，1 表示很小改动，5 表示专家级工作。
3
预计时间有经验贡献者完成调查、实现、测试并准备 pull request 的粗略时间范围。
1-2 days
活动状态议题当前的可参与程度：新鲜、活跃、陈旧、阻塞或等待维护者输入。
stale
清晰度议题是否清楚说明期望改动、验收标准和下一步。
clear
前置要求
Atom editor APIJavaScript
新手友好度1-100 的估计分数，表示该议题对首次贡献者的友好程度。
60
研究方向
The current behavior opens the conflict file from a temporary folder. The desired behavior is to create a new editor with the file path set to `/my/project/path/~file under conflict.txt` and use the `setText` method to set the content from the temp folder. Look at the GitHub package's code that handles opening conflict views. The main file to modify is likely `lib/views/conflict view.coffee` or similar. Ensure the new path uses a tilde prefix to distinguish from the original file.
When viewing undo discard conflicts in a new file, set path to project folder · atom/github#601 | Good First Issue