Am Montag, 14. Februar 2011, um 20:35:17 schrieb Andrew: > 14.02.2011 21:19, KP Kirchdoerfer пишет: > > Am Montag, 14. Februar 2011, um 20:06:34 schrieb Andrew: > >> Hi all. > >> I fixed apkg.mergefile, it looks like it works OK. > > > > Hi Andrew; > > > > Great! > > > > Have pulled from git and do a complete right now to test the changes > > for "localrepo". The result should have your fix and I'll try to test > > it tomorrow. > > > > As newbie with git, I'm curious if the your changes and the latest > > commits to master works. Lokking at Qgit I see a graph of your > > branching(?)... > > > > kp > > If you work with outdated local tree - it automatically creates a new > branch of somebody put commit into main tree at this time. Then, when > you try to push your commits into tree - git checks for new commits into > main tree, and if they are present - it acks for sync; and after 'git > pull' - if file modifications aren't overlapped, it automatically merge > branches, if some files were changed in both master and local branches - > it will ask for running merge or other resolving of this trouble.
Sounds cool. Just to be shure I understand the information Qgit gives me - you haven't touched any shorewall*./buildtoolmk ? kp ------------------------------------------------------------------------------ The ultimate all-in-one performance toolkit: Intel(R) Parallel Studio XE: Pinpoint memory and threading errors before they happen. Find and fix more than 250 security defects in the development cycle. Locate bottlenecks in serial and parallel code that limit performance. http://p.sf.net/sfu/intel-dev2devfeb _______________________________________________ leaf-devel mailing list leaf-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/leaf-devel
