Skip to content

Conversation

@smaglio81
Copy link
Contributor

The changes are in Tests/Common.ps1 and in GitHubConfiguration.ps1. They should match up with the conversation that we were having on issue #124.

However, I am new to git and am currently terrified that I've

  1. Accidentally commited a change to your actual repository (09a219d)

  2. In an attempt to rebase my fork to the latest of your upstream, that I somehow reintroduced a bunch of changes/commits that you had already made.

I apologize in advance if I'm confused things and made them more difficult. I'm happy to delete my fork and start from scratch if this has all gone wrong.

@HowardWolosky
Copy link
Contributor

You haven't committed those changes to the master repo. Those changes are only in the ucsb fork. I do find it odd that the hash works against the master here, but that code simply isn't here. You won't see those changes in the commit history, nor will you see those changes in what is currently in master for Tests/Common.ps1 nor Tests/GitHubConfiguration.ps1.

Your fork is in a pretty messed up state at the moment due to your rebase. The cleanest thing to do at this point is to start over. I'll close this PR down and will review once you re-post it from a clean fork.

As a point of reference, you should always avoid working from master. Create a different branch off of master for each change that you're working on. That way you can be working on multiple changes at the same time that are not tied to each other (just make sure that you're creating each branch off of master by checking-out master first, and then creating the new branch each time).

So, clear out this fork, make a new one, and then the first thing you should do is create a new branch off of master in your fork to work on these changes. Then create a PR coming from that new branch in your repo, targeted to master in this repo.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants