🔑 The key to faster merging is to pull sooner! Here is how you can make sure you’re always up to date with your remote and reduce the chances of conflicts.
1️⃣ If you haven’t already, go to the VS Code marketplace and install GitLive extension.
2️⃣ Once you click on the GitLive icon in the activity bar, you'll get the overview of all branches ahead, in terms of commits, of your current branch, and changes on those branches, grouped by the author.
3️⃣ Your tracking and base branches will show at the top of the tree. If you're behind you’ll see how many commits there are to pull and you can open up the branch to review the changes.