yarnpkg/yarn

Merge conflicts in cache for packages installed via Git

Open

#2,845 建立於 2017年3月6日

在 GitHub 查看
 (1 留言) (8 反應) (0 負責人)JavaScript (41,514 star) (2,731 fork)batch import
cat-buggood first issuehelp wantedtriaged

描述

Initial package.json:

    "some-package": "git+ssh://git@github.com/joncursisome-package.git#0.639.0",

Desired package.json (bumped up one version):

    "some-package": "git+ssh://git@github.com/joncursisome-package.git#0.639.0",

Running yarn on the new package.json:

error Command failed.
Exit code: 1
Command: git
Arguments: pull
Directory: /Users/jcursi/Library/Caches/Yarn/.tmp/d737a03d45898fb0b871801e2bd41c85
Output:
From ssh://github.com/joncursi/some-package
   c95bf22..a58677f  master     -> origin/master
 * [new tag]         v0.639.0   -> v0.639.0
error: Your local changes to the following files would be overwritten by merge:
	<file name here>
	<file name here>
	<file name here>
Please commit your changes or stash them before you merge.
error: The following untracked working tree files would be removed by merge:
	<file name here>
	<file name here>
	<file name here>
Please move or remove them before you merge.
Aborting
Updating c95bf22..a58677f

The "solution" is to

cd /Users/jcursi/Library/Caches/Yarn/.tmp/d737a03d45898fb0b871801e2bd41c85
git stash

And then re-run yarn in the project root. Is there a better way to tell yarn "yes, please overwrite that package in the cache" other than having to cd into it and git stash every time?

貢獻者指南

技術棧
javascript
領域
developer experiencetooling
議題類型
bug
難度面向新貢獻者的預計實作難度，1 表示很小改動，5 表示專家級工作。
3
預計時間有經驗貢獻者完成調查、實作、測試並準備 pull request 的粗略時間範圍。
1-3 hours
活動狀態議題目前的可參與程度：新鮮、活躍、陳舊、阻塞或等待維護者輸入。
stale
清晰度議題是否清楚說明預期改動、驗收標準和下一步。
clear
前置要求
Basic Yarn knowledgeGit fundamentals
新手友善度1-100 的估計分數，表示該議題對首次貢獻者的友善程度。
60
研究方向
Investigate how Yarn handles git dependencies in its cache when updating versions. The issue suggests that Yarn uses 'git pull' which can cause merge conflicts when local changes exist in the cache. Look into Yarn's cache management code, likely in the 'src/package fetcher.js' or similar files, to understand the process. Consider implementing a 'git fetch' and 'git reset hard' approach instead of 'git pull' to avoid conflicts, or provide an option to force overwrite the cache.