Skip to content

Instantly share code, notes, and snippets.

@Tyrael

Tyrael/gist:259f0f8a24c9c1a5816b

Created January 11, 2016 16:29
Show Gist options
  • Save Tyrael/259f0f8a24c9c1a5816b to your computer and use it in GitHub Desktop.
Save Tyrael/259f0f8a24c9c1a5816b to your computer and use it in GitHub Desktop.
Download ZIP
Raw
gistfile1.txt
Merging via command line
If you do not want to use the merge button or an automatic merge cannot be performed, you can perform a manual merge on the command line.
HTTPS
Git
Patch
https://github.com/marcosptf/web-gtk.git
Step 1: From your project repository, check out a new branch and test the changes.
git checkout -b marcosptf-patch-1 master
git pull https://github.com/marcosptf/web-gtk.git patch-1
Step 2: Merge the changes and update on GitHub.
git checkout master
git merge --no-ff marcosptf-patch-1
git push origin master
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment