Re: Translation commits pushed when rolling a tarball

On Sat, Aug 2, 2014 at 4:09 PM, Sébastien Wilmet <swilmet gnome org> wrote:
On Sat, 2014-08-02 at 15:55 +0200, Sébastien Wilmet wrote:
On Sat, 2014-08-02 at 15:21 +0200, drago01 wrote:
Well you could just create a branch do your release there so that you
don't have to care about what happens on master (branches are free in
git) and merge it back to master afterwards.

In GNOME we generally prefer to have a linear git history, but creating
a branch is indeed another solution.

(replying to myself after a bit more thoughts)

I think it's the best compromise. I've never thought about this solution
because I always do a rebase on top of master. Thanks for the tip!

Actually thats what I usually do but trouble with this approach is
that I often then forget that I'm on the branch and assume everything
went fine after doing a successfull `git push origin master && git
push origin TAG`. Later I realize that master has changed and my tag
is not in its history. :(


Zeeshan Ali (Khattak)
Befriend GNOME:

[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]