开源软件名称：

开源软件地址：

开源编程语言：

开源软件介绍：

Merge Conflicts

Deprecation Notice

This 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 git merge and overlays a set of controls for resolving each and navigating among them. Additionally, it displays your progress through a merge.

Installation

apm install merge-conflicts

Features

• Conflict resolution controls are provided for each detected conflict.
• Choose your version, their version, combinations thereof, or arbitrary changes edited in place as a resolution.
• Navigate to the next and previous conflicts in each file.
• Track your progress through a merge with per-file progress bars and a file list.
• Save and stage your resolved version of each file as it's completed.

Using

When git merge tells you that it couldn't resolve all of your conflicts automatically:

$ git merge branch
Auto-merging two
CONFLICT (content): Merge conflict in two
Auto-merging one
CONFLICT (content): Merge conflict in one
Automatic merge failed; fix conflicts and then commit the result.

Open Atom on your project and run the command Merge Conflicts: Detect (default hotkey: alt-m d). You'll see a panel at the bottom of the window describing your progress through the merge:

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.