Skip to content

Merging

Jump to bottom
Zhamri Che Ani edited this page Jan 3, 2022 · 3 revisions

How to:

Basic Merging

  $ git checkout master
  Switched to branch 'master'
  $ git merge stiw3054

Basic Merging Conflicts

  $ git mergetool

Merge conflicts locally from GitHub Pull Request

Example steps

  $ git fetch origin
  $ git switch new-branch
  $ git merge master
  (open the file, fix conflict)

  $ git switch master
  $ git merge new-branch
  $ git push origin master

References:

https://www.atlassian.com/git/tutorials/git-merge

Clone this wiki locally