aws_scripts | Useful scripts for maintaining multiple AWS Accounts | AWS library

Notice the modified in your git status output. That means you already added and commited the __pycache__.

git rm -r it, commit and it should start to be properly ignored.

It is not a bad idea to start with official .gitignores from the beginning and extend those: https://github.com/github/gitignore

This is likely due to version mismatches.

Try doing:

Just don't reraise the error

This sort of thing is why I encourage those new to Git to avoid git pull: the pull command is a convenience command that combines two other Git commands.

The base commands are:

• git fetch, meaning obtain new commits from someone else, followed by
• the second command: combine the work I did in my repository with my new commits, with the work they did in their repository with their new commits.

It's true that the first step—the git fetch—is not very useful on its own, because getting their commits is equivalent to just getting a bunch of packages delivered. Until you open them up and use what's in them, they just sit around. So you do need two steps. But I think it's better, for various reasons, to do them on your own at first. (Not everyone agrees with me.)

The second command is where things can get sticky. You choose which second command to use: the default is git merge, but you can (and, based on messages above, did) select git rebase instead. Either method means combine my work with their work; the difference is how the combining is done:

• git merge combines everything in one step, leaving all the original commits untouched. Since history, in Git, is commits, this preserves exactly what you did, and exactly what they did.

• git rebase has the effect of copying your earlier commits to different, new-and-one-hopes-improved, commits. Your Git then abandons your original commits in favor of these new and ?improved? commits. Since history, in Git, is the commits in the repository, this leaves you with a more-readable history. It's kind of a fake history though: it implies that you did your work after they did theirs, rather than in parallel with theirs.

There are some strong reasons to prefer one or the other in some cases. In your particular case, probably none of those reasons apply, so either method is fine.

Now, the actual problem here is that during the merge-or-rebase, Git has come across the following situation:

• You removed a file entirely.
• They changed the file.

Git isn't sure how to combine these actions. Perhaps you want to keep the changed file, or just the lines they put in and remove all the other lines. Perhaps you want the file to stay removed. Git isn't willing to pick one answer on its own. So, it stops in the middle of the operation.

Your job is to finish the operation. There are a lot of details, but probably you just want to keep the file gone. To do that, tell Git keep the file gone by removing it and git adding the result, or using git rm on the file (which I find easier to remember, and has the same effect, but sometimes generates a mild complaint). Then tell Git to continue the operation, whatever it was.

In your particular case, the operation is a rebase, so to continue it after resolving the conflict, run:

The error message is telling you that find expects a dict or other mapping. However, you passed in a set. Try this instead:

Given that the JSON format is correct, the issue arises in the mongo_export_to_file() function. First of all, note that the columns are ordered alphabetically in the output. One quick-and-dirty fix would be to append a letter to each column name to preserve the original order (AWS account -> a_AWS_account; Account Number -> b_Account _Number). This would leave the rest of the code intact.

Anyhow, you must have lost the original column order somewhere. Python dict doesn't necessarily keep the original order. Following @Shubham 's comment, I would try two things:

1. Substituting the doc dict in the first line of the for loop by an OrderedDict:

Try this.

• Reset index of memory_df dataframe.
• Concatenate the two dataframes: hosts_df and memory_df.

2 things:

• You need to provide header=None in pd.read_csv command to consider the value in text file as data. This is because by default, pandas assumes the first row to be header.
• Since you are reading multiple files, you need to append each dataframe into another. Currently you are overwriting df on each iteration.

Code should be like:

The problem with your code is in this line: