0.3 patch1 #1377
0.3 patch1 #1377
Conversation
… 0.3-patch1 The devil to get everythin consistent when master is changing, and our 0.3-devel should not revert Adam's changes
|
I suspect changing the size value to human readable with break adm console, which as I recall expects to do that on the front end. |
|
Just FYI this PR includes duplicate copies of commits/patches from months ago making it very hard to read. Rebasing isn't easy for sure! But "11 Files changed" (near the top-right of this ticket) is simply not accurate. It appears the true number is "2 Files changed" here? In any case, please let's avoid duplicate commits/patches (already merged months ago) in future. Thereby making our work genuinely visible/understandable to all. |
|
Adam,
Tim and I have agreed to use 0.3-devel as our aggregation branch. I think
that all of the commits to that branch must also include commits that Adam
has made into master. Otherwise when we merge 0.3-devel into master, all
Adam's commits into master will be reversed. I made an attempt to rebase
onto master before submitting to s0.3-devel.
Maybe I still do not understand how git works.
…On Thu, Jan 10, 2019 at 3:49 PM A Holt ***@***.***> wrote:
Just FYI this PR includes duplicate copies of commits/patches from months
ago making it very hard to read.
Rebasing isn't easy for sure! But "11 Files changed" (near the top-right
of this ticket) is simply not accurate. It appears the true number is "2
Files changed" here?
In any case, please let's avoid duplicate commits/patches (already merged
months ago) in future. Thereby making our work genuinely
visible/understandable to all.
—
You are receiving this because you modified the open/close state.
Reply to this email directly, view it on GitHub
<#1377 (comment)>, or mute
the thread
<https://github.com/notifications/unsubscribe-auth/AB04HHC9teFmqWjUHUqGm_YV52oFcBKGks5vB9F-gaJpZM4Z6cFY>
.
|
I don't believe that's true. My understanding is that only new commits are layered on.
Agreed rebasing is annoyingly hard. (I don't see how already committed patches from months ago are relevant here, but then again I'm not the expert on rebasing...) |
(Without affecting the hundreds of other commits that have been merged into master over recent months!) |
|
The other issue is that for testing, we'd like to be as close to what
will be the case when we land in master.
We will not have that, if master has diverged since we started testing
in 0.3-devel
…On Thu, Jan 10, 2019 at 5:38 PM A Holt ***@***.***> wrote:
Otherwise when we merge 0.3-devel into master, all
Adam's commits into master will be reversed.
I don't believe that's true. My understanding is that [] new commits are [merely] layered on.
(Without affecting the hundreds of other commits that have been merged into master over recent months!)
—
You are receiving this because you modified the open/close state.
Reply to this email directly, view it on GitHub, or mute the thread.
|
Some additional changes that were not included in the first try