Thanks guys, I think I have it sorted now.
> On 1 Jul 2019, at 6:19 am, andy pugh wrote:
>
> If my new stuff is a single commit I take a short-cut.
>
> On Sun, 30 Jun 2019 at 20:52, Chris Morley wrote:
>
>> If I am working on a private branch based on master and want to push my work
>> :
>>
If my new stuff is a single commit I take a short-cut.
On Sun, 30 Jun 2019 at 20:52, Chris Morley wrote:
> If I am working on a private branch based on master and want to push my work :
> and If my private branch is behind linuxcnc's master
>
> switch to my local master and pull to bring it up
From: Phillip Carter
Sent: June 30, 2019 11:59 AM
To: EMC developers
Subject: [Emc-developers] Workflow
I noticed today when I pushed a commit that it also pushed a message about a
merge between my branches which doesn't seem correct.Currently I do all my work
I noticed today when I pushed a commit that it also pushed a message about a
merge between my branches which doesn't seem correct.Currently I do all my work
on my plasmac branch. I checkout master, fetch from upstream then rebase
upstream/master. I then checkout plasmac and merge master.Then I
