umm-csci-3601 / merge-conflict-demo

A repository used to demonstrate merge conflicts in a screencast

merge-conflict-demo

A repository used to demonstrate merge conflicts in a screencast for UMM's CSci 3601 (Software Design and Development).

We'll use this to illustrate changes to a repo that rarely cause conflicts, followed by changes that almost always lead to conflicts.

The current version of the video: https://www.youtube.com/watch?v=Am6xSrPVX98

merge-conflict-demo's Issues

Mention `.gitignore`

In the current version of the video I end up mentioning but doing nothing about a group of files created by IDEA that I don't want to commit to the project. I really should have met that head on and:

• Talked about why you don't want to commit a lot of IDEA clutter, and
• Show them how to use .gitignore to ignore those files so they don't inadvertently get committed

Use IDEA's graphical display of the branches

The only part of IDEA's version control tool that I showed in the video was the panel that showed local changes. I really should use the graphical display that shows commits and branches as I think that does a very nice job of illustrating the what's happening. This is true at the beginning (we can see the commits as they happen), but is especially true when we get to the branching in the second half.

If I do this, I really should have "KK's" commits in the second half actually happen in a separate branch so that branch shows up in the diagram. (I actually just did all "KK's" work in master since I knew that no one would "see" it.)

Show how you can amend a commit

When I discover that IDEA is suggesting that I change the public methods to private, I could use that to illustrate amending to an existing commit, which might be nice. I would need to talk about the dangers of amending commits, but it's a nice technique if people haven't pushed yet.

Update this for GitKraken and VS Code