AUTO_MERGE can thus be used with git-diff[1] to show the changes you’ve made so far to resolve conflicts. Using the same example as above, after resolving the conflict we get: $ git diff AUTO_MERGE diff --git a
$ git merge next 100% (4/4) done Auto-merged file.txt CONFLICT (content): Merge conflict in file.txt Automatic merge failed; fix conflicts and then commit the result. Conflict markers are left in the problematic files, and after you resolve the conflicts manually, you can update the index...
* The logic to auto-follow tags by "git clone --single-branch" was not careful to avoid lazy-fetching unnecessary tags, which has been corrected. (merge 167a575e2d jk/use-quick-lookup-in-clone-for-tag-following later to maint). * "git rebase -i" did not leave the reflog entries cor...
(merge 7c3e9e8cfb jc/auto-gc-quiet later to maint). * The code to skip unmerged paths in the index when sparse checkout is in use would have made out-of-bound access of the in-core index when the last path was unmerged, which has been corrected. * Serving a "git fetch" client ...
This is useful for running autoformatting tools like eslint --fix or stylefmt but can be used for any arbitrary sequences.For example:{ "*.js": ["eslint", "prettier --write"] }going to execute eslint and if it exits with 0 code, it will execute prettier --write on all staged *...
In addition, we've addressed a performance regression for git lfs migrate import that was introduced in v3.0.2.At the moment, there are no translations available, but if you are interested in contributing to one, please reach out in an issue. For compatibility with Windows and to retain ...
(local|relative|default|iso|rfc|short) ] [ [--objects | --objects-edge] [ --unpacked ] ] [ --pretty | --header ] [ --bisect ] [ --bisect-vars ] [ --bisect-all ] [ --merge ] [ --reverse ] [ --walk-reflogs ] [ --no-walk ] [ --do-walk ] <commit>... [ -- ...
不关注关注所有动态仅关注版本发行动态关注但不提醒动态 1Star0Fork0 陈昌华/fontconfig 代码Issues0Pull Requests0Wiki统计流水线 服务 我知道了,不再自动展开 加入Gitee 与超过 1200万 开发者一起发现、参与优秀开源项目,私有仓库也完全免费 :) 免费加入
It was a regression in Prettier 2.6.0. // Input switch (state) { default: result = state; // no change break; } // Prettier 2.8.1 switch (state) { default: // no change result = state; break; } // Prettier 2.8.2 switch (state) { default: result = state; // no change bre...
run test_full for qemu port CI - autobuild: don't allow a board to change its ID - pyboard.py: wait a bit before accessing the PTY serial port - autobuild: template the generation of esp32 port deploy.md - mpremote: avoid initial blocking read in read_until() - mpremote: introduce...