search for: archaist

Displaying 3 results from an estimated 3 matches for "archaist".

Did you mean: archanist
2019 Nov 10
2
Workflow to commit changes using git alone (?)
...always merged with master before starting the procedure. The Phabricator diff is created by comparing both branches after they have merged, and the point of reseting ’tmp' to ‘master’ is to obtain a fresh commit containing exactly the same diff. In any case, I would want to understand why the archaist command does not suffer from an “evolving” master, which is the problem that you raised first. The “arc patch” command creates a new branch from the local master, so the remote repo can still have changed even before the actual command is completed (!) or at any time after that. So what makes execu...
2019 Nov 10
2
Workflow to commit changes using git alone (?)
> On 10 Nov 2019, at 07:00, Mehdi AMINI <joker.eph at gmail.com> wrote: > > recipe is not correct in the absolute: the delta from master does not mean it contains exactly what you want, you seem to assume that master didn't evolve between the time "patchbranch" was created. > Hi Mehdi, I’m doing it this way to make sure that master /actually/ contains “exactly
2019 Nov 08
3
Workflow to commit changes using git alone (?)
Hi All, Ok, just for the matter of providing feedback that may be useful for others, I figured out one way to do it based on the setup that I described earlier. It can be something like this git checkout patchbranch # checkout to the patch branch, this is the one containing the differential patch code git checkout -b tmp # checkout to a new tmp branch git reset —soft master