public inbox for development@lists.ipfire.org
 help / color / mirror / Atom feed
From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject: Re: Re: Request to merge
Date: Tue, 09 Apr 2013 16:35:41 +0200	[thread overview]
Message-ID: <1365518141.17024.63.camel@rice-oxley.tremer.info> (raw)
In-Reply-To: <CAAiW7AeSQ9XwR5o9OW0TH4NY+vWZqTyB3994_yhmznaR-nXgmA@mail.gmail.com>

[-- Attachment #1: Type: text/plain, Size: 2540 bytes --]

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(a)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(a)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(a)lists.ipfire.org
>         http://lists.ipfire.org/mailman/listinfo/development
> 
> 


       reply	other threads:[~2013-04-09 14:35 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <CAAiW7AeSQ9XwR5o9OW0TH4NY+vWZqTyB3994_yhmznaR-nXgmA@mail.gmail.com>
2013-04-09 14:35 ` Michael Tremer [this message]
     [not found] <CAAiW7Ae_W270Xt5PFB9aqb1a+dwcZUPFhMXq1GUhtV7tFwP6vQ@mail.gmail.com>
2013-04-25 10:42 ` Michael Tremer
     [not found] <CAAiW7AepkyTw6jcqAnDuYhPGwrSC-iLq_vqXCBrVCcEc5SoS2A@mail.gmail.com>
2013-04-09 12:55 ` Michael Tremer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1365518141.17024.63.camel@rice-oxley.tremer.info \
    --to=michael.tremer@ipfire.org \
    --cc=development@lists.ipfire.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox