Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adding SC NMP FPs #3342

Merged
merged 31 commits into from Nov 23, 2019
Merged

Adding SC NMP FPs #3342

merged 31 commits into from Nov 23, 2019

Conversation

Markkos1992
Copy link
Contributor

@Markkos1992 Markkos1992 commented Nov 22, 2019

@michihdeu, I just want to note that a couple of your files were originally inadvertently changed (deurp.l145 and deurp.1415).

I believed I have fixed those issues using the latest master files.

…0/US-20

Revert "Revert "6-1-2019 Update""
PA 128 Recentering 7-22-2019
PA 652 Recentering 7-24-2019
US 62 Business(Sharon) Relocation plus PA 418, PA 518, PA 718, PA 760, and PA 846 Recentering
PA Branch Update 8-9-2019
SC 6 TRUCK and SC 19 TRUCK Datacheck FPs
@yakra yakra closed this Nov 22, 2019
@yakra yakra reopened this Nov 22, 2019
@michihdeu
Copy link
Contributor

@Markkos1992 There seem to be more issues also with files from other contributors. Changes from June are undone and I don't have the time to go through all (my nor of all contributors) files. Please make sure that you don't change file by accident.

@Markkos1992
Copy link
Contributor Author

I was using this secondarily as a chance to sync my master branch to the master Travel Mapping branch.

How two other files were accidentally (temporarily) changed? I really do not know.

I definitely will be checking moving forward to make sure that only the files I intended to edit were edited. Thankfully, I caught that and fixed the other files in this case.

@jteresco jteresco merged commit d63d2ac into TravelMapping:master Nov 23, 2019
@yakra
Copy link
Contributor

yakra commented Nov 23, 2019

@si404 wrote in #3345 (comment):

I forgot to close and reopen updates.csv over the sync up with the master branch.

@yakra
Copy link
Contributor

yakra commented Nov 23, 2019

Not sure if that applies here, or how other contributors' files would have gotten mucked up, but anyway.

The reversions checked out OK for my files, and checking their blame in @Markkos1992 's branch, it looked like these cases weren't even registering as new commits.

For example, now that it's merged into master, I'm still blamed for 2019-09-02;(Canada) Nova Scotia;NS 245;ns.ns245;Extended eastward from NS 227 to NS 4.

@yakra
Copy link
Contributor

yakra commented Dec 1, 2019

What I think happened:
The changes to other contribs' files (or files with multiple maintainers such as updates.csv) didn't represent actual edits to the underlying files as such, not an edit commit -- but the merge commit that updated them in @Markkos1992's fork.
All that got reverted was the merge commit that synced Markkos1992:master or Markkos1992:PA-I-90/US-20 etc to TravelMapping:master.
For example, at Markkos1992#206 right near the top of the list, I see a couple of my own commits. My files were in fact edited by me.

So everything's fine, just a little funny-looking.

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.

None yet

4 participants