search

OperationCode / operationcode_bot

Slack bot for responding to Slack events and handling interactive messages. (not currently in use)
MIT License
7 stars 37 forks source link

Updates welcome message #82

Open ksmacleod99 opened 7 years ago

ksmacleod99 commented 7 years ago

Description of changes

Proposed updates to Slackbot welcome message

Issue Resolved

No existing issue

hpjaj commented 6 years ago

@ksmacleod99 - Once PR https://github.com/OperationCode/operationcode_bot/pull/86 is merged, and you rebase on master, you should no longer have failing tests.

jjhampton commented 6 years ago

It seems like some commits in this PR (f280b70 thru c87a6b3) are duplicates of commits that are already in master. Seems like this somehow happened during rebase?

ksmacleod99 commented 6 years ago

I have no idea. How can I clean this up and get it to work properly?

jjhampton commented 6 years ago

@ksmacleod99 Ideally, a PR should be as lean as possible, and only contain the changes you're proposing to merge in. It's not the biggest deal in the world, but the duplicate commits contain the same changes that other people have already added (just with new commit hashes), which could be confusing for someone else trying to read thru the commit history in a linear fashion and figure out what happened, when, and why.

So, your branch (ksmacleod99:master) really only needs to contain the commits 0152753 (Updates welcome message) and 3e4207a (Delete .DS_Store) that you actually added. Somehow during your rebase/merge/force-push, those other commits (f280b70 thru c87a6b3) got caught in there.

No worries tho! Luckily, you can easily use Git's interactive rebase feature to clean up your commit history that you are proposing to merge in w/ this PR. I would be happy to walk you through the process.

ksmacleod99 commented 6 years ago

@jjhampton Yes, that would be great! I have no idea how I did that (but I also had no idea how to rebase, so that might be the problem). I need to call it an evening; but when would be a good time for you?