Hi Folks especially the git advocates I am struggling again, after a few changes in my config branch I am faced with the following.
mega@leafbuilder:~/leaf/devel/bering-uclibc$ git commit
[config 0536506] A big batch of small changes in the webconf package.
Lots of adaptions to a slighttly more modern look and the new
wpasupp.lwp package to control the behaviour of a WiFi client.
16 files changed, 177 insertions(+), 88 deletions(-)
create mode 100644 repo/lwp/wpasupp.tgz
create mode 100755 repo/webconf/var/webconf/lib/extract_stanza.awk
create mode 100755 repo/webconf/var/webconf/lib/info.func
create mode 100644 repo/webconf/var/webconf/www/interfaces.info
mega@leafbuilder:~/leaf/devel/bering-uclibc$ git rebase maint
Zunächst wird der Branch zurückgespult, um Ihre Änderungen
darauf neu anzuwenden...
Wende an: A backport of Jorge Contreras' additions to apkg in the master
branch
Wende an: The first version of a cloning utility which allows
Wende an: A backport of Jorge Contreras' additions to apkg in the master
branch
Verwende Informationen aus der Staging-Area um einen Basisverzeichnis
nachzustellen
M repo/config/apkg
<stdin>:16: trailing whitespace.
#
<stdin>:39: trailing whitespace.
# expandpath rewritten for brevity
<stdin>:72: trailing whitespace.
# rewritten for brevity
<stdin>:117: trailing whitespace.
pkg=$( basename $1 .lrp )
<stdin>:183: trailing whitespace.
fi
warning: unterdrückte 2 Whitespace-Fehler
warning: 7 Zeilen fügen Whitespace-Fehler hinzu.
Falle zurück zum Patchen der Basis und des 3-Wege-Merges...
Keine Änderungen -- Patches bereits angewendet.
Wende an: The first version of a cloning utility which allows
Verwende Informationen aus der Staging-Area um einen Basisverzeichnis
nachzustellen
M repo/config/buildtool.cfg
M repo/config/buildtool.mk
M repo/config/lrcfg
<stdin>:79: trailing whitespace.
# You need a boot loader, which allows booting from multiple partitions and
<stdin>:80: trailing whitespace.
# sufficient partitioned storage. It is recommended to make a small
partition
<stdin>:81: trailing whitespace.
# for the boot loader only and create an additional 2 partitions for the
<stdin>:86: trailing whitespace.
# to use this you need to specify mount points
<stdin>:107: trailing whitespace.
is_mounted "$i" && umount $i;
warning: unterdrückte 11 Whitespace-Fehler
warning: 16 Zeilen fügen Whitespace-Fehler hinzu.
Falle zurück zum Patchen der Basis und des 3-Wege-Merges...
Keine Änderungen -- Patches bereits angewendet.
Wende an: Removed command to run wpa client in automatic wpa startup
Wende an: Added functions to handle bridge interfaces to webconf
Wende an: A few additions to the webconf interface configuration, adding
support
Wende an: Prevent interfaces on a bridge to be activated automatically
Wende an: Added bottom padding to the warning paragraph
Wende an: Converted tooltips from DOS to UNIX line termination format
Wende an: This is an attempt to revive the webconf interface. The goal
is a slightly
Wende an: A big batch of small changes in the webconf package. Lots
mega@leafbuilder:~/leaf/devel/bering-uclibc$ git status
Auf Branch config
Ihr Branch und 'origin/config' sind divergiert,
und haben jeweils 15 und 10 unterschiedliche Commits.
(benutzen Sie "git pull" um Ihren Branch mit dem Remote-Branch
zusammenzuführen)
nichts zu committen, Arbeitsverzeichnis unverändert
>>>>>>>>>>>>>>>>>>>>>>>>
The above is probably real bogus as all my changes were done locally. Nw
following the advice leads to even more bogus warnings.
>>>>>>>>>>>>>>>>>>>>>>>>
mega@leafbuilder:~/leaf/devel/bering-uclibc$ git pull
Password:
remote: Counting objects: 84, done.
remote: Compressing objects: 100% (55/55), done.
remote: Total 55 (delta 34), reused 0 (delta 0)
Unpacking objects: 100% (55/55), done.
Von ssh://git.code.sf.net/p/leaf/bering-uclibc
693104c..a28abaf maint -> origin/maint
0fa3dd4..729eff1 master -> origin/master
* [neues Tag] v5.1.2 -> v5.1.2
automatischer Merge von repo/webconf/var/webconf/www/interfaces.css
automatischer Merge von repo/webconf/var/webconf/www/interfaces.cgi
KONFLIKT (Inhalt): Merge-Konflikt in
repo/webconf/var/webconf/www/interfaces.cgi
automatischer Merge von repo/webconf/var/webconf/www/interfaces.blurb
KONFLIKT (Inhalt): Merge-Konflikt in
repo/webconf/var/webconf/www/interfaces.blurb
Automatischer Merge fehlgeschlagen; beheben Sie die Konflikte und
committen Sie dann das Ergebnis.
Now the big question is, how to handle the conflicts and what the hell
are they?
Good luck
Erich
smime.p7s
Description: S/MIME Cryptographic Signature
------------------------------------------------------------------------------ Download BIRT iHub F-Type - The Free Enterprise-Grade BIRT Server from Actuate! Instantly Supercharge Your Business Reports and Dashboards with Interactivity, Sharing, Native Excel Exports, App Integration & more Get technology previously reserved for billion-dollar corporations, FREE http://pubads.g.doubleclick.net/gampad/clk?id=164703151&iu=/4140/ostg.clktrk
_______________________________________________ leaf-devel mailing list leaf-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/leaf-devel
