search

paulodiovani / hacktoberrank

Hacktoberfest Rank
https://hacktoberrank-challenge.herokuapp.com/
MIT License
6 stars 17 forks source link

Fetch list pull requests #23

Closed arabyalhomsi closed 4 years ago

arabyalhomsi commented 4 years ago

Finally finished it! Testing took sometime, I hope it is good enough. https://github.com/paulodiovani/hacktoberrank/issues/4

paulodiovani commented 4 years ago

Will look ASAP, :) BTW, there are conflicting files, probably due to code styling changes (we are using standardjs linter now), please, sync with master to fix.

arabyalhomsi commented 4 years ago

Done! @paulodiovani

paulodiovani commented 4 years ago

I tried to fix conflict but they are actually more tricky than I expected. As a last resort you can create a new branch and reapply the changes:

# add and fetch upstream, if you haven't yet
git remote add upstream https://github.com/paulodiovani/hacktoberrank.git
git fetch upstream

# sync your master
git checkout master
git merge upstream/master

# create a new branch
git checkout -b fetch_list_pull_requests-fix

# apply all the changes from this branch
git diff --no-color master fetch_list_pull_requests | git apply

# review changes and commit