Hello!
PCMan has written on Saturday, 15 September, at 11:25:
>BTW, the search branch of pcmanfm is done using git merge.
>Andriy will hate this very much, but the merge was done before he
>suggest using git rebase.
>I don't know how to convert the merged result to use git rebase instead.
>If someone knows how to do it, please help.
It can be done very easy:
1) backup your working tree
2) remake it with rebase:
git checkout search
git reset --hard <last commit before your merge>
<the rebase itself as I've written to you before>
3) sync if resulting tree is different from backup (not sync .git/ dir
of course!) and make update commit if need
4) replace the search branch on remote with fixed one
I'll try to find that commit a bit later if you don't do that yoursef
before that.
Andriy.
------------------------------------------------------------------------------
How fast is your code?
3 out of 4 devs don\\\'t know how their code performs in production.
Find out how slow your code is with AppDynamics Lite.
http://ad.doubleclick.net/clk;262219672;13503038;z?
http://info.appdynamics.com/FreeJavaPerformanceDownload.html
_______________________________________________
Pcmanfm-develop mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/pcmanfm-develop
