For educational (Q.A.) purposes, I'm creating a series of git coding exercises that force students to create a merge conflicts in different ways and practice solving them.

I'm wondering if there are other ways common, or even uncommon ways such as working stash, locked files, etc.

Similar resources (not duplicates):

• How do I safely merge a Git branch into master?
• How do I resolve merge conflicts in a Git repository?
• How can I selectively merge or pick changes from another branch in Git?
• How to compare files from two different branches