Closed emacgillavry closed 1 year ago
@emacgillavry this branch has conflicts with master
which are preventing it from being merged.
It might be because I merged your other PR via squash
🤷
Could you please rebase it against master
so it can be merged 🙏
hmm there's still something not quite right about the commit history.
I think we just want this one commit right? https://github.com/pelias/parser/pull/168/commits/c0d80177abeaf9228f18b7ed5e9c022e999f305d
How I would do this:
assuming your remote is 'origin', add the 'upstream' remote:
git remote add upstream https://github.com/pelias/parser.git
rebase your local branch against upstream/master
:
git checkout 167-dreef-street-type
git fetch upstream
git rebase upstream/master
you should then only have that one commit difference from upstream master
force push your branch:
git checkout 167-dreef-street-type
git push -f origin 167-dreef-street-type
:wave: I did some awesome work for the Pelias project and would love for everyone to have a look at it and provide feedback.
Here's the reason for this change :rocket:
Here's what actually got changed :clap:
dreef
toconcatenated_suffixes_separable.txt
Here's how others can test the changes :eyes: