https://github.com/robertdfrench/merge-against-traffic

Merge commits can introduce bugs even when all parent commits pass tests.
https://github.com/robertdfrench/merge-against-traffic

bug cicd git pull-requests trick

Last synced: 5 months ago
JSON representation

Merge commits can introduce bugs even when all parent commits pass tests.

• Host: GitHub
• URL: https://github.com/robertdfrench/merge-against-traffic
• Owner: robertdfrench
• License: mit
• Created: 2024-01-09T04:41:41.000Z (over 2 years ago)
• Default Branch: trunk
• Last Pushed: 2024-01-09T05:09:02.000Z (over 2 years ago)
• Last Synced: 2024-01-10T06:00:44.728Z (over 2 years ago)
• Topics: bug, cicd, git, pull-requests, trick
• Language: C
• Homepage:
• Size: 476 KB
• Stars: 0
• Watchers: 1
• Forks: 0
• Open Issues: 0
• Metadata Files:
  • Readme: README.md
  • License: LICENSE

Awesome Lists containing this project

README

          
# Merge Against Traffic

![Merging can be Dangerous](banner.png)

* This version of the code is broken.

* The original [1.0.0][1] version was not.

* I submitted two PRs ([#1][2] and [#2][3]), each of which passed `make test`.

* The resulting merge commit ([2.0.0][4]) contains a compile error (duplicate definitions of `int c`), *even though neither pull request did*.

* This README was modified after the experiment was done (outside of a

  PR) in order to clarify what is going on.

[1]: https://github.com/robertdfrench/merge-against-traffic/tree/1.0.0

[2]: https://github.com/robertdfrench/merge-against-traffic/pull/1/files

[3]: https://github.com/robertdfrench/merge-against-traffic/pull/2/files

[4]: https://github.com/robertdfrench/merge-against-traffic/tree/2.0.0