Closed calaorrene closed 1 year ago
Please resolve these merge conflicts: https://github.com/Stacktrek-Training/stack-ilearning/pull/28/conflicts
It'll show up when executing git pull origin main. Before executing make sure your local changes are already committed.
git pull origin main
Please resolve these merge conflicts: https://github.com/Stacktrek-Training/stack-ilearning/pull/28/conflicts
It'll show up when executing
git pull origin main
. Before executing make sure your local changes are already committed.