[leaf-devel] Spurious merge message

[Erich Titl]

Hi Folks






Please refer to the message below.

Thanks

Erich


-------- Weitergeleitete Nachricht --------
Betreff:        [leaf:bering-uclibc] 2 new commits to Bering-uClibc
Datum:  Thu, 02 Jul 2015 08:00:47 +0000
Von:    LEAF Linux Embedded Appliance Framework Git repository
<nore...@bering-uclibc.leaf.p.re.sf.net>
Antwort an:     LEAF Linux Embedded Appliance Framework Git repository
<nore...@bering-uclibc.leaf.p.re.sf.net>
An:     LEAF Linux Embedded Appliance Framework Git repository
<nore...@bering-uclibc.leaf.p.re.sf.net>



    Branch: master

Merge branch 'master' of ssh://git.code.sf.net/p/leaf/bering-uclibc

By Erich Titl on 07/02/2015 07:59
*View Changes*
<http://sourceforge.net/p/leaf/bering-uclibc/ci/225e9e4a9bccb20634f03e75215582d292b16772>

------------------------------------------------------------------------

fixed identification of known networks in /var/webconf/lib/wpa.func

By Erich Titl on 07/01/2015 19:46
*View Changes*
<http://sourceforge.net/p/leaf/bering-uclibc/ci/c2784b3f32db512633500fcc378739287e00fdc3>

------------------------------------------------------------------------

Sent from sourceforge.net because you indicated interest in
https://sourceforge.net/p/leaf/bering-uclibc/
<https://sourceforge.net/p/leaf/bering-uclibc>

To unsubscribe from further messages, please visit
https://sourceforge.net/auth/subscriptions/
<https://sourceforge.net/auth/subscriptions>

I still do not grok the semantics of git. I just made a small patch to a file which nobody looked at for weeks anyway. I am not online all the time, so most of my work is being done offline. My local repository tends to be out of sync sometimes and IMHO that is OK. Now how do I avoid this stupid merge that is forced on me (and especially the message that goes along with it). Is git a pure online tool or are there settings that avoid these conflicts?

smime.p7s
Description: S/MIME Cryptographic Signature

------------------------------------------------------------------------------
Don't Limit Your Business. Reach for the Cloud.
GigeNET's Cloud Solutions provide you with the tools and support that
you need to offload your IT needs and focus on growing your business.
Configured For All Businesses. Start Your Cloud Today.
https://www.gigenetcloud.com/
_______________________________________________
leaf-devel mailing list
leaf-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/leaf-devel