Request to merge

Michael Tremer michael.tremer at ipfire.org
Tue Apr 9 16:35:41 CEST 2013


Please create a patch against the "next" branch that I can merge.

Also, please review your other commits and create a clean branch against
"next" with them, because I cannot even merge the first commit without
having conflicts:

[root at rice-oxley ipfire-2.x (next)]# git merge
a6cafac8d4b27e01729f2384ba03c33e91dfc944
Auto-merging langs/en/cgi-bin/en.pl
Auto-merging langs/de/cgi-bin/de.pl
Auto-merging html/html/themes/maniac/include/functions.pl
CONFLICT (content): Merge conflict in
html/html/themes/maniac/include/functions.pl
Auto-merging html/html/themes/ipfire/include/functions.pl
CONFLICT (content): Merge conflict in
html/html/themes/ipfire/include/functions.pl
Removing html/html/images/updbooster/updxl-yl.gif
Removing html/html/images/updbooster/updxl-rd.gif
Removing html/html/images/updbooster/updxl-led-yellow.gif
Removing html/html/images/updbooster/updxl-led-red.gif
Removing html/html/images/updbooster/updxl-led-green.gif
Removing html/html/images/updbooster/updxl-led-gray.gif
Removing html/html/images/updbooster/updxl-led-blue.gif
Removing html/html/images/updbooster/updxl-gr.gif
Removing html/html/images/updbooster/updxl-globe.gif
Auto-merging html/cgi-bin/updatexlrator.cgi
CONFLICT (content): Merge conflict in html/cgi-bin/updatexlrator.cgi
Automatic merge failed; fix conflicts and then commit the result.

Michael

On Tue, 2013-04-09 at 15:52 +0200, Jörn-Ingo Weigert wrote:
> here are the List what should be updated
> 
> 
> /srv/web/ipfire/cgi-bin/updatexlrator.cgi
> /srv/web/ipfire/html/themes/ipfire/images/updxl-icons.gif
> /srv/web/ipfire/html/themes/ipfire/include/updxlr.css
> 
> /srv/web/ipfire/html/themes/maniac/images/updxl-icons.gif
> 
> /srv/web/ipfire/html/themes/ipfire/maniac/updxlr.css
> 
> 
> 
> and the actual images from:
> 
> 
> /srv/web/ipfire/images/updbooster/updxlr-src-*.gif
> 
> 
> greets Ingo
> 
> 
> 2013/4/9 Michael Tremer <michael.tremer at ipfire.org>
>         Hey,
>         
>         I am gonna merge those changes for core update 68. Could you
>         please
>         check if all changes files are in the core update's filelist
>         (config/rootfiles/core/68/...)?
>         
>         Please also make sure, that all rootfiles are up to date, so
>         no files
>         will be missing in the install images.
>         
>         Michael
>         
>         _______________________________________________
>         Development mailing list
>         Development at lists.ipfire.org
>         http://lists.ipfire.org/mailman/listinfo/development
> 
> 



More information about the Development mailing list