Run ./rebase.sh Using git /usr/bin/git git version 2.37.3 ⚠️ There are conflicting files, trying to solve... ️ Analyzing conflict for code/build/gulpfile.reh.js code/build/gulpfile.reh.js file cannot ...

Check out a branch that has conflicts with master/main branch Run git rebase master Resolve conflicts in VS Code Click the ️ icon in VS Code Git side panel Result: the progress bar keeps rolling but ...

This is the second part of my Use gitk to understand git post. In my initial overview, I demonstrated creating a branch, making a couple commits to that branch, and then merging them back into master.