Note: Generally, you should run push with –force option very carefully. The next section explains with some screenshots and more details on how to merge a command, resolve the conflicts and reverting back the merge. The above command should merge the feature branch commits into the master branch, so both branches are now at the same level. In terms of executing the command, this is how it works at its basic:Īfter the work is done for adding the footer component, you may merge it into the master branch as follows: This is where git merge command plays its role in letting you join feature branch work into the master branch. footer for the website in that feature branch.Īfter completing the work, you want to combine the development into the master branch. For example, if your main branch is the master branch and you started working on another branch called feature branch. As the name suggests, the merge command is used to join the histories of two or more developments.
0 kommentar(er)
