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

[kuychaco]

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

[Deepa-chaurasiya01]

I'm a newcomer, and I want to work on this. Would you please guide me?