Search Results

Search found 2 results on 1 pages for 'edwardmlyte'.

Page 1/1 | 1 

• Future raid update in a NAS and HP ProLiant alternatives

  - by edwardmlyte

  I'm thinking of buying the HP ProLiant MicroServer*. My question is if I just put a single 2TB drive, how easy would it be in the future to upgrade to a second 2TB drive in a RAID-1 setup? Can this be done without formatting the original 2TB drive? *It looks like the £100 cashback offer is stopping end of Aug, making this system cost around £260 without HDDs. Are there any other brands that anyone would recommend for all-in-one hardware solutions.

  Read the article

• How to rebase onto a private branch with conflicts in gerrit/git?

  - by edwardmlyte

  Aim: I want to rebase commit G from "bravo", onto commit F from "alpha". From this: G bravo / D--E--F alpha / A--B--C mainline To this: G bravo / D--E--F alpha / A--B--C mainline "alpha" has been successfully rebased onto the latest mainline work. I cherry-pick "alpha" onto C. And when I cherry-pick "bravo", it comes up with all the merge conflicts. Once I fix those, if I do commit --amend The commit message just has all the information for alpha, whereas I'd expect the information for bravo. So I tried again after hard resetting to C, doing pull (as oppose to cherry-pick) for alpha and then pull bravo. Fixed the conflicts and just ran: commit The commit message just lists it as a merge and has merge information. Though the commit succeeds, I can't push this to gerrit as it says I don't have the rights to push merges. When I've read about rebase, it's always just to mainline, but I want to rebase private branches. Where am I going wrong?

  Read the article

1