Skip to content

Instantly share code, notes, and snippets.

@StevenPuttemans
Created June 12, 2017 11:29
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save StevenPuttemans/4dbb941d803508045909f93c432a9dc8 to your computer and use it in GitHub Desktop.
Save StevenPuttemans/4dbb941d803508045909f93c432a9dc8 to your computer and use it in GitHub Desktop.
Merge darknet upstream changes into a single commit

This can be done with the following commands

git pull --squash origin_PJREDDIE master
git add --all
git commit -m "Merge upstream PJReddie fixes"
git push -f https://gitlab.com/EAVISE/darknet.git master

Of course, if during the pull merge conflicts appear, you need to solve those first.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment