[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    Re: [kdepim] /: 4.10 branch was opened so I can activate it
From:       David Faure <faure () kde ! org>
Date:       2012-12-28 10:10:20
Message-ID: 1655497.b8tpygL8lb () asterix ! site
[Download RAW message or body]

On Sunday 16 December 2012 23:32:07 laurent Montel wrote:
> when I will merge branch in master it will remove it in master too.
> So I don't know how to avoid it

1) Do a first merge, to ensure there's nothing pending.
2) Delete the directory in 4.10, commit
3) Do a merge, ensure nothing else came along [*]
4) Cancel the changes locally (git reset . ; git checkout .)
5) Commit the (no-op) merge, push

The point is: you can adjust the code in a merge commit. In particular this 
allows to undo a change coming from the stable branch, and yet git merge knows 
that the commit has been merged in, so it won't try to merge it in again.

Well, to make sure of the above I did it locally, shall I push that?

[*] A very convenient alias for finding out "what push will actually push" is:
wup = log --stat @{u}..
In case of merges, it shows all the commits that the merge has merged in.

-- 
David Faure, faure@kde.org, http://www.davidfaure.fr
Working on KDE, in particular KDE Frameworks 5

[prev in list] [next in list] [prev in thread] [next in thread]