Skip to content

git merge <branch|sha> #19

@iGrec-a2n

Description

@iGrec-a2n

-Perform 3-way merge and create a merge commit with 2 parents.

  • On conflict: insert <<<<<<<, =======, >>>>>>> markers into file(s).
  • ❌ No rebase, squash, or fast-forward-only merges.

Metadata

Metadata

Assignees

Labels

Projects

No projects

Milestone

No milestone

Relationships

None yet

Development

No branches or pull requests

Issue actions