https://github.com/plume-lib/merging

Merge drivers and merge tools for git
https://github.com/plume-lib/merging

Last synced: 8 days ago
JSON representation

Merge drivers and merge tools for git

• Host: GitHub
• URL: https://github.com/plume-lib/merging
• Owner: plume-lib
• License: mit
• Created: 2024-04-19T19:51:05.000Z (7 months ago)
• Default Branch: main
• Last Pushed: 2024-10-29T09:16:39.000Z (18 days ago)
• Last Synced: 2024-10-29T11:06:54.511Z (18 days ago)
• Language: Java
• Size: 384 KB
• Stars: 1
• Watchers: 3
• Forks: 1
• Open Issues: 0
• Metadata Files:
  • Readme: README-adjacent-lines.md
  • License: LICENSE

Awesome Lists containing this project

README

        
# Adjacent lines

This merger resolves conflicts that result from edits on different but adjacent

lines.  By default, git reports such edits as conflicts that must be manually

resolved.

## Example

Suppose that git merge yields a conflict like the following:

```

a

<<<<<<< OURS

bleft1

bleft2

bleft3

c

||||||| BASE

b

c

=======

b

>>>>>>> THEIRS

d

```

The adjacent-lines merger would resolve the conflict as:

```

a

bleft1

bleft2

bleft3

d

```