Fake Git Merge Conflict - Free Online | LittlePrank

After opening it, the terminal outputs a "merge disaster": red "CONFLICT (content): Merge conflict in xxx", automatic merge failure prompt, conflicting file list, and "Please manually resolve conflicts" guidance appear in turn. The output style is the same as the real git merge error. Conflict files and branch names can be customized, and you can even fake classic conflicts between "feature-xxx" branches.

The error reporting is a front-end simulation and will not actually perform any git operations or change the code warehouse; the page will be restored when it is closed, and the workspace will be intact. If you want to act really, you can choose a colleague to pop it up when he has just finished merging branches and is relaxing, so that the suspicion of "Is something wrong with the code that just merged?" will naturally emerge.

It is suitable for teasing programmers-"Did you just merge?" can instantly remind the other person of the fear of being dominated by conflict; it is also often used as interface material to demonstrate conflict scenarios in Git teaching videos, allowing novices to intuitively understand "what conflicts look like."

Reminder: Don't use it for colleagues who are dealing with real merger conflicts; choose the spoof objects when relaxing and expose them immediately after the performance. You can also talk about tips for resolving conflicts, such as "Look at HEAD first and then look at remote branches."

The fake Git merge conflict displays the red letter "CONFLICT" and the conflict file list on the terminal. The programmer's blood pressure suddenly fills, as if he has returned to the painful scene of conflict resolution.