You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Reverting all changes in master from caffe-0.13 so we can merge changes from caffe-0.14.
I wanted to do this upgrade (1) while preserving commit history for public commits, (2) without force-pushing to any public branches and (3) with a single revert commit. The git command was pretty hairy. I ended up with this after following this SO post:
After some testing, here would be the consequences of deleting master and setting caffe-0.14 as the master branch:
git pull would throw a strange error if you had the master branch checked out:
Your configuration specifies to merge with the ref 'master'
from the remote, but no such ref was fetched.
Old clones wouldn't be switched over to the new branch automatically - they would need to re-clone or git checkout caffe-0.14 to switch to the new version.
remotes/origin/HEAD would not be updated automatically to the new default branch and would throw this warning because master is missing - (refs/remotes/origin/HEAD has become dangling). It's not a problem, but you could resolve it with this command: git remote set-head origin --auto.
(1) and (3) would only appear with this release because we'd be deleting the master branch - in future releases we won't need to delete any branches.
For the next release, we would start development on caffe-0.15 (or maybe nvcaffe-0.15) and change the default branch from caffe-0.14 to caffe-0.15 when we go to public RC. We would of course leave the old release branches around.
I think we should do it because it matches our development flow and is a more reasonable solution than manually keeping two branches in sync (which is whatwecurrentlydo).
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Reverting all changes in
masterfromcaffe-0.13so we can merge changes fromcaffe-0.14.I wanted to do this upgrade (1) while preserving commit history for public commits, (2) without force-pushing to any public branches and (3) with a single revert commit. The git command was pretty hairy. I ended up with this after following this SO post:
Don't ask me to explain it all, but now we can do a
git merge nvidia/caffe-0.14(with no merge conflicts) to syncmasterwithcaffe-0.14.