Commit a bunch of random files!
Resolve conflicts.