On 22/10/14 11:32, Martin Grigorov wrote:
Hi Andrea,
I've added some comments to
https://github.com/apache/wicket/commit/6b879633f7d6f4cde571f510d8cc7ed4f09da1bb
The same commit is also in master branch:
https://git-wip-us.apache.org/repos/asf?p=wicket.git;a=commit;h=db5be6ab.
What is your strategy to merge them later ?
That's a good point. We can simply work on the new branch and later
rebase master on it. Or, if it's safer, we can reset master branch to
your commit 46684ffdf5fa (WICKET-5713 Move /wicket.properties to
/META-INF/wicket/xyz.properties) and cherry pick the few commits that
are related to other issues. In this way we can take out my work from
master until we are done with code revision in the new branch.
