You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Once your branch development is finished and fully functional, the last task is to merge it with the parent branch (dev or master) using the git merge command.
The git merge command combines the commits from your feature branch into the dev (or master) branch, effectively integrating your changes. To ensure a successful merge, make sure you are currently on the branch you want to merge your feature branch into.
Command
Description
git merge [branch name]
Merge a branch into the active branch
git merge [source branch] [target branch]
Merge a branch into a target branch
git stash
Stash changes in a dirty working directory
git stash clear
Remove all stashed entries
Inspection and Comparison Command
Command
Description
git log
View changes
git log --summary
View changes (detailed)
git log --oneline
View changes (briefly)
git diff [source branch] [target branch]
Preview changes before merging
Updating Projects on github
Command
Description
git push origin [branch name]
Push the current branch to the remote counterpart of that branch
git push -u origin [branch name]
This creates a remote branch and sets it upstream of the current branch you are pushing
git push
This command is used to upload local repository content to a remote repository.