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

Fixes to pull request #2 #3

Open
wants to merge 30 commits into
base: master
Choose a base branch
from

Conversation

neomatrix369
Copy link
Member

The following issues are fixed:

  1. commented out dependency - now removed
  2. volatile CHM (overkill) - now removed
  3. Symbole should be Symbol without the 'e' - now fixed
  4. Cloning of threadsafe object (overkill) - changed to returning object itself
  5. All the unnecessary and <~> files removed!
  6. Added an updated .gitignore file.

@neomatrix369
Copy link
Member Author

And a couple more files! Aargh!

@ghost ghost assigned karianna Mar 18, 2013
@karianna
Copy link
Member

It's still deleting .gitignore

@neomatrix369
Copy link
Member Author

  • out of curiosity to understand Git - does anyone know why this pull request cannot be merged , now the @HelioFrota 's request supersedes this PR. Is it possible to make the PR merge-able again? Tried the below to manually merge but it says Already up-to-date.
    git merge --no-ff --log -m "Merge pull request Some improvements #2 from neomatrix369/master" master

@karianna
Copy link
Member

Hey Mani, you need to do a "git pull [email protected]:Adopt-a-JSR/JSR-353-JSON.git master" which should then show you what is conflicting. Fix the conflicts, git commit and git push to make this PR mergable again.

@neomatrix369
Copy link
Member Author

Thanks @karianna, resolved now, but the new push has all the files newly uploaded, yesterday I got rid of the big files / folders from the target and . folders from history hopefully repo size is smaller.

@karianna karianna removed their assignment Apr 13, 2021
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