[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: best workflow with git ?
From: |
Eli Zaretskii |
Subject: |
Re: best workflow with git ? |
Date: |
Sat, 10 Jun 2017 20:11:38 +0300 |
> From: Jean-Christophe Helary <address@hidden>
> Date: Sun, 11 Jun 2017 00:04:06 +0900
>
> I got the repository from Savannah and each time I want to update it I do a
> "git pull origin master". If I have worked on some files before that I
> usually get a message asking me to commit my files otherwise they'd be
> overwritten. Since I'm not pushing anything to Savannah I feel that
> committing to the local Master is useless and will only create discrepancies
> between my repository and Savannah.
>
> What should I do ? Create a branch where I do all my modifications ?
For a long-term development, yes. For short-term jobs, I' like
Dmitry, use "git stash". (And in many cases "git pull" will not even
ask for that, so I don't need to do anything.)
> And then do a git diff to create a patch that I send here ?
Yes.
> When the patch has been applied, what should I do with the branch and the
> modified files ?
You could delete the branch.