This is the tenth progress report for TrackGit project. I did the following in last week.
Last week I implemented Pull command. While pulling changes, sometimes there might be conflicts while merging the changes. These conflicts are shown when pull command execution is finished. In addition to that, I implemented a “Show conflicts” option to see the current conflicting files in the repository. This option is only shown when there are conflicts in the repository. Link to the commit.
This is a companion discussion topic for the original entry at https://www.haiku-os.org/blog/hrily/2018-07-09_gsoc_2018_-_trackgit_progress_report_10/