A lesson about resolving merging conflicts by appacademy.io
-
Updated
Dec 15, 2022 - JavaScript
A lesson about resolving merging conflicts by appacademy.io
Project #58 of Codecademy's Full Stack Engineer Career Path
⚙️ A Github Action that merge one branch in another!
gh-pages merge from master branch.BAT (Usage: make a Windows shortcut to this (with empty "Start in:" field) and VOILA you can drag-and-drop your git repo folder! Even easier if you copy the shortcut into SendTo.)
Git is your version control best friend, and GitHub is where collaboration magic happens! Below is a guide to the most useful Git & GitHub commands you’ll use daily. Let’s master the flow of commits, branches, and merges! 🚀
Add a description, image, and links to the merge-branch topic page so that developers can more easily learn about it.
To associate your repository with the merge-branch topic, visit your repo's landing page and select "manage topics."