https://github.com/capslocky/git-rebase-via-merge

Resolve conflicts with minimum pain.
https://github.com/capslocky/git-rebase-via-merge

conflict git merge rebase

Last synced: 3 months ago
JSON representation

Resolve conflicts with minimum pain.

• Host: GitHub
• URL: https://github.com/capslocky/git-rebase-via-merge
• Owner: capslocky
• License: mit
• Created: 2018-12-16T10:47:47.000Z (over 7 years ago)
• Default Branch: master
• Last Pushed: 2026-02-13T23:33:58.000Z (4 months ago)
• Last Synced: 2026-02-14T05:26:44.510Z (4 months ago)
• Topics: conflict, git, merge, rebase
• Language: Shell
• Homepage:
• Size: 23.4 KB
• Stars: 95
• Watchers: 4
• Forks: 16
• Open Issues: 0
• Metadata Files:
  • Readme: README.md
  • License: LICENSE.txt

Awesome Lists containing this project