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

implemented hapax legomena index #53

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

Conversation

supersonic1999
Copy link
Contributor

#28

@dpalmasan
Copy link
Owner

I think to avoid the merge conflicts, you will need to set upstream the repo:

git remote add upstream git@github.com:dpalmasan/TRUNAJOD2.0.git

Then to fetch the commits (and branches) from the "upstream":

git fetch upstream

Then probably pulling changes in your local master branch: git pull. And your branch devissue-28 might need to be rebased from master git rebase master

@supersonic1999
Copy link
Contributor Author

I think to avoid the merge conflicts, you will need to set upstream the repo:

git remote add upstream git@github.com:dpalmasan/TRUNAJOD2.0.git

Then to fetch the commits (and branches) from the "upstream":

git fetch upstream

Then probably pulling changes in your local master branch: git pull. And your branch devissue-28 might need to be rebased from master git rebase master

Thanks for the info!

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.

2 participants