[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [ESD-translators] Workflow with the .zip source package
|
From: |
Thérèse Godefroy |
|
Subject: |
Re: [ESD-translators] Workflow with the .zip source package |
|
Date: |
Mon, 18 Apr 2016 08:56:06 +0200 |
|
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Icedove/38.7.0 |
Le 18/04/2016 08:10, Thérèse Godefroy a écrit :
> Your workflow seems fine. You can also create a local branch and work
> there if you want to keep track of modifications, but don't push the
> complete branch. Just cherry-pick the final result to master.
To avoid conflicts, it may be easier to copy the final result outside
the repo, switch to master, then move it back to the repo. This is
basically what you are doing now. :)
Thérèse