July 2018
Beginner
552 pages
13h 18m
English
When you are developing code in a branch, at some point, there will come a time to merge those changes back into development or master, thereby kicking off your release pipeline, for example. We will talk about release pipelines in Chapter 11, VSCode and PowerShell Release Pipelines. At the very least, you will need to merge your local changes back into the original repository so that others can see and use your code.
Merging code is pretty simple. You make sure that everything is committed. Afterwards, you change into the branch that you want to merge into, and specify the branch that you want to merge. The next code sample shows how to merge changes into a specific branch:
# Merge changes back to mastergit checkout mastergit merge ...
Read now
Unlock full access