pull with --rebase in Pkg.update() #10529
Merged
Conversation
This file contains 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
tkelman
force-pushed
the
tk/pkg-update-rebase
branch
from
ba743ac
to
7a037fe
Compare
tkelman
changed the title
|
Seems like a good idea. Feel free to merge it. |
|
+1 |
tkelman
added a commit
that referenced
this pull request
Mar 17, 2015
pull with --rebase in Pkg.update()
|
Should we maybe backport this for 0.3.12? It's a one-liner and does make Metadata PR's cleaner. |
|
backported in 1b838a4 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
See https://groups.google.com/d/msg/julia-dev/vrVSPbHRdIM/uEIBysnh2G4J for motivation
Merge commits are messy and confusing, they accumulate in your local METADATA if you do
Pkg.tagthenPkg.updatea bunch of times before publishing and finally merging your new commits into the official repo. There's already a todo here about merge conflicts, I don't think preferring rebase over merge makes the situation any worse.edit: looks like
--rebase, but not-r, is supported by our minimum required version of git: http:https://git-scm.com/docs/git-pull/1.7.3