在线时间:8:00-16:00
迪恩网络APP
随时随地掌握行业动态
扫描二维码
关注迪恩网络微信公众号
开源软件名称:smashwilson/merge-conflicts开源软件地址:https://github.com/smashwilson/merge-conflicts开源编程语言:CoffeeScript 69.2%开源软件介绍:Merge ConflictsDeprecation NoticeThis package is deprecated and subsumed by the Git and GitHub integration that's bundled with Atom starting with 1.18.0-beta0. I highly recommend using that instead! Resolve your git merge conflicts in Atom! This package detects the conflict markers left by Installationapm install merge-conflicts Features
UsingWhen
Open Atom on your project and run the command Click each filename to visit it and step through the identified conflicts. For each conflict area, click "Use me" on either side of the change to accept that side as-is: Use the right-click menu to choose more advanced resolutions, like "ours then theirs", or edit any chunk by hand then click "use me" to accept your manual modifications. Once you've addressed all of the conflicts within a file, you'll be prompted to save and stage the changes you've made: Finally, when all of the conflicts throughout the project have been dealt with, a message will appear to prompt you how to commit the resolution and continue on your way. |
2023-10-27
2022-08-15
2022-08-17
2022-09-23
2022-08-13
请发表评论