Pulling the dynamic-rate-limiting branch over to master.
Briefly, I made changes to the master instead of creating a branch to test on. Then I decided I wanted to start over, so I created the dynamic-rate-limiting branch. Now I want to move all the changes in that branch over to the master and forget everything I did to the master branch since my original fork.
Someone more familiar with git would have done this differently.
Pulling the dynamic-rate-limiting branch over to master.
Briefly, I made changes to the master instead of creating a branch to test on. Then I decided I wanted to start over, so I created the dynamic-rate-limiting branch. Now I want to move all the changes in that branch over to the master and forget everything I did to the master branch since my original fork.
Someone more familiar with git would have done this differently.