Search the Community
Showing results for tags 'merge'.
Found 5 results
-
Hello I have several json files in one directory. i would like to merge them in to one. I did something like this <?php foreach (glob("../json/*.json") as $filename) { echo basename($filename) . "\n"; } $res1 = file_get_contents($filename); echo $res1; ?> But it echoes only the last (the first echo is to view all files which is not important here) Then I tried many versions of foreach inside foreach with no success. Like this: <?php foreach (glob("../json/*.json") as $filename) { foreach (file_get_contents($filename) as $a) { } } echo $a; ?> So I appreciate a little help here, thank you.
-
I use git every day, but don't do much with branches because I work alone. I'm curious about something related to the branches, when a new branch is on a remote, and then it needs to be fetched and merged separately from the master branch. So pretend I'm on the master branch on my machine: git checkout -b develop # I make changes to files on develop git add . git commit -am "I have made changes to develop" git push origin develop Now there is a develop branch on the remote. Somebody else now fetches and merges (they are on master): git fetch origin # git shows that there is a new branch develop, and merge is also required for origin/master Normally without the develop branch, I would run this command from master: git merge origin/master Do I also need to checkout develop and merge origin/develop? # Do I need to do this too? git checkout develop git merge origin/develop Is there a way to merge all branches with their remote counterparts, all in one command?
-
Hi, I have 3 client tables I would like to merge into a single one in the central server. Those client tables won't have conflicting PK, and can only insert data. I thought of federated tables, but network sortages really ARE an issue, so I dismissed it. The approach should be able to store data locally, but send it to the server when available, and the server would store it altogether in a single table. What would be the best approach to it? Thank you
-
call number date duration 19738424064 2012-05-01 09:04:17 0.008 19738424064 2012-05-01 12:01:52 0.072 19738424064 2012-05-01 14:27:30 0.004 19738424064 2012-05-01 14:28:02 0.004 19738424065 2012-05-01 14:14:17 0.02 19738424065 2012-05-01 14:28:24 0.008 19738424064 2012-05-02 09:20:19 0.004 19738424064 2012-05-02 09:08:04 0.048 19738424065 2012-05-02 09:21:33 0.072 19738424064 2012-05-02 14:16:54 0.028 how do I get json php and call number should not repeated and google api line graph to calculate the total call in hour 05-2012.txt -
I'm trying to merge all these queries into one statement $q = "DELETE FROM ".TBL_USERS." WHERE username = '$session->username'"; $database->query($q); $q = "DELETE FROM ".TBL_BANNED_USERS." WHERE username = '$session->username'"; $database->query($q); $q = "DELETE FROM ".TBL_MAIL." WHERE UserTo = '$session->username'"; $database->query($q); $q = "DELETE FROM ".TBL_MAIL." WHERE UserFrom = '$session->username'"; $database->query($q); $q = "DELETE FROM ".TBL_FRIENDS." WHERE person_id = '$session->username'"; $database->query($q); $q = "DELETE FROM ".TBL_FRIENDS." WHERE friend_id = '$session->username'"; $database->query($q); $q = "DELETE FROM ".TBL_FORUM." WHERE author = '$session->username'"; $database->query($q); I have no idea how to do this I have tried Google and no joy please help - Jamie
