GNOME/meld ported to a VS Code Extension

Team Project (T-Track)

Diff Multiplexer - A TUI mergetool

Learning how to deal with merge conflicts. Note, that this is not a straightforward merge conflict. Please pay attention to the details and the code. It is based on Java.

This is the repository for our midterm where we will be debating console VS PC gaming.

Collaboration project where we practiced merge conflict.