initBasti / ScanAndShipTool (public) (License: GPLv3) (since 2019-05-08) (hash sha1)
A tool to simplify the shipping process of goods from a plentymarkets ERP to Amazon FBA.
Clone URLs: https://rocketgit.com/user/initBasti/ScanAndShipTool ssh://rocketgit@ssh.rocketgit.com/user/initBasti/ScanAndShipTool git://git.rocketgit.com/user/initBasti/ScanAndShipTool
Merge request 1 (8a606d3925abd243b6a83103a31c6ea2d4e1002e -> 4551e961132a4d430f34ecc97e0a859fd68d9d08)
By: anonymous
Against ref: refs/heads/master
Date: 2019-05-08 18:31
This merge request can be merged without conflicts.
List of commits:
Subject Hash Author Date (UTC)
minor corrections on the comments and clean up 4551e961132a4d430f34ecc97e0a859fd68d9d08 Sebastian 2019-05-08 18:30:39
Commit 4551e961132a4d430f34ecc97e0a859fd68d9d08 - minor corrections on the comments and clean up
Author: Sebastian
Author date (UTC): 2019-05-08 18:30
Committer name: Sebastian
Committer date (UTC): 2019-05-08 18:30
Parent(s): 8a606d3925abd243b6a83103a31c6ea2d4e1002e
Signing key:
Tree: ca6ec4ce19923dd8525160f3ad60b6af891b3a5d
File Lines added Lines deleted
src/scangui.c 1 9
File src/scangui.c changed (mode: 100644) (index de06f4b..cfcc498)
... ... static void scan_action(GtkButton *button, gpointer data)
208 208 return; return;
209 209 } }
210 210
211 //input_data->number = ((struct scandata *)data)->number;
212 //input_data->input = ((struct scandata *)data)->input;
213 //input_data->container = ((struct scandata *)data)->container;
214 //input_data->inner_container = ((struct scandata *)data)->inner_container;
215
216 211 g_print("clickdata->number : %d\n",((struct scandata*)data)->number); g_print("clickdata->number : %d\n",((struct scandata*)data)->number);
217 212 g_print("input_data->number : %d\n",input_data->number); g_print("input_data->number : %d\n",input_data->number);
218 //GtkStateFlags entry_flags = gtk_widget_get_state_flags((GtkWidget *)((struct scandata *) input_data )->input);
219
220 //g_print("State of test_entry: %d\n", entry_flags);
221 213
222 214 // initialize the struct object for test purposes // initialize the struct object for test purposes
223 215 //test_data = malloc(sizeof(char[14]) + sizeof(char[30]) + 2*sizeof(int)); //test_data = malloc(sizeof(char[14]) + sizeof(char[30]) + 2*sizeof(int));
 
... ... static void scan_action(GtkButton *button, gpointer data)
234 226 printf("barcode: %s , quantity: %d\n" printf("barcode: %s , quantity: %d\n"
235 227 , ((struct dataset*)testitem)->barcode, ((struct dataset*)testitem)->qty); , ((struct dataset*)testitem)->barcode, ((struct dataset*)testitem)->qty);
236 228
237 // Causes segmentation fault! initialize the parameter first and then cast it!
229 // Causes segmentation fault!
238 230 entry_text = gtk_entry_get_text(GTK_ENTRY(input_data->input)); entry_text = gtk_entry_get_text(GTK_ENTRY(input_data->input));
239 231 g_print("Input-data: %s\n", entry_text); g_print("Input-data: %s\n", entry_text);
240 232
Hints:
How to merge on your machine?
git fetch origin refs/mr/1:mr-1
git checkout main
git merge mr-1

To "see" all the merge requests as branches,
add, in the config file (.git/config), under the remote you want, a line like this:
fetch = +refs/mr/*:refs/remotes/your_remote_name_for_example_origin/mr/*
After you run a git fetch, you will have all the pull requests locally.
For example, you can merge one of them:
git checkout main
git merge mr/1