initBasti / Amazon2PlentySync (public) (License: GPLv3) (since 2019-01-27) (hash sha1)
Transfer your data from you Amazon Flatfile spreadsheet over to the Plentymarkets system. How to is included in the readme
Clone URLs: https://rocketgit.com/user/initBasti/Amazon2PlentySync ssh://rocketgit@ssh.rocketgit.com/user/initBasti/Amazon2PlentySync git://git.rocketgit.com/user/initBasti/Amazon2PlentySync
Merge request 1 (37c01ce472dc85a9f7a39bd164a2ea53c28b4955 -> cade904d13282014b0d845b69402261aa9157071)
By: anonymous
Against ref: refs/heads/feature/amazon-data
Date: 2019-03-20 13:18
This merge request can be merged without conflicts.
List of commits:
Subject Hash Author Date (UTC)
small change to variation upload to go around a bug concerning the item_name cade904d13282014b0d845b69402261aa9157071 LagerBadel 2019-03-20 13:18:25
Commit cade904d13282014b0d845b69402261aa9157071 - small change to variation upload to go around a bug concerning the item_name
Author: LagerBadel
Author date (UTC): 2019-03-20 13:18
Committer name: LagerBadel
Committer date (UTC): 2019-03-20 13:18
Parent(s): 37c01ce472dc85a9f7a39bd164a2ea53c28b4955
Signing key:
Tree: 928e1eca2fd6cbf64c647aa913b7c31c3b9c1d0e
File Lines added Lines deleted
packages/variation_upload.py 3 0
File packages/variation_upload.py changed (mode: 100644) (index c1b4b5a..c845961)
... ... def variationUpload(flatfile, intern_number):
51 51 with open(flatfile, mode='r') as item: with open(flatfile, mode='r') as item:
52 52 reader = csv.DictReader(item, delimiter=";") reader = csv.DictReader(item, delimiter=";")
53 53 for row in reader: for row in reader:
54 # test
55 item_name = ''
56
54 57 if(row['parent_child'] == 'parent'): if(row['parent_child'] == 'parent'):
55 58 item_name = row['item_name'] item_name = row['item_name']
56 59 if(row['parent_child'] == 'child'): if(row['parent_child'] == 'child'):
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