search

ashish2199 / Aidos

A beginner friendly project with aim of creating our own version of Bomberman.
GNU General Public License v3.0
41 stars 28 forks source link

Issues related to Forking, Pulling from and Pushing to repo #7

Open ashish2199 opened 6 years ago

ashish2199 commented 6 years ago

I plan to make a wiki page with the steps for contributing to this repo.

Until then please mention your issues related to version control, you are facing while contributing to this repository over here.

dostertag commented 6 years ago

Glad you set this up, Ashish. Github says my personal fork is 13 revs behind. Here is what I've tried at my command line:

image

What is the proper way to fix this? I've tried multiple 'solutions' from around the web but am kind of stuck. Any help would be appreciated.

ItsStolas commented 6 years ago

Hey @dostertag If you have no local changes you'd like to hold on to, do this.

git reset --hard upstream/master git push origin master --force

That will make your repo perfectly in sync with the remote one, but it will discard any local changes.

ItsStolas commented 6 years ago

Otherwise just try

git pull upstream master git add . git commit -m "Syning with upstream" git push origin master

dostertag commented 6 years ago

Thanks, Corey. I did both as you suggested but still have a ton of errors...

image

image

Thanks again for your help. Hopefully, I won't be immortalized as the git idiot from reddit....

ItsStolas commented 6 years ago

Well, you're repo is even with upstream now. Have you refreshed it properly in your editor?

Oh you won't be! Git is a huge headache to learn. I spent about 4 hours yesterday with problems before deleting my repo and re-cloning it, haha.

dostertag commented 6 years ago

Thanks for pointing out that I'm now even on github!!! I can work with that.

dostertag commented 6 years ago

Still having issues.... Ultimately, I deleted my Aidos project folder from my pc then: git clone ("used the clone address from this repo - not my own") and opened the project in netbeans locally... Still have errors:

image

Hovering over an error states that there's duplicate classes all over... Is there a binary or hidden folder that I'm not deleting?

ashish2199 commented 6 years ago

I wonder if this is because of this I am unsure why we have two folders for the package here on github but when I clone the repo I only seem to get one

image

ashish2199 commented 6 years ago

@dostertag I have tried to merge the two folders based on the instructions given here

image

Please clone the repo and check again. Hopefully this should have fixed the issue I feel. Let us know if you are still getting those errors.

dostertag commented 6 years ago

Thanks, Ashish. I'll try again once I get home. It's a family holiday in the US today (Thanksgiving) so I'll be out.

dostertag commented 6 years ago

I'm up to date. Thanks!!

CiaranRoft commented 6 years ago

OK so I joined this project at the very start but did not really have the time to put in to it straight away!

What I want to do is just "grab" the code you guys have been working on for the past few months! I have forked the report ages ago at the very start, but I don't know how to update my local code with all of your guys new code? Sorry if this is a newbie question but its tricky to figure out. I'm using git bash as well. I have my own fork on github.com and my local copy is looking at that for updates!

So once I get and understand the code how do I contribute to the master? It's all new and sort of intimidating cause I don't know how to even phrase the question to get a helpful Google seach!

Anyways I want to get in to open source and this really is the best project for me to start with I just need a little help getting used to git and maybe under standing code in the future! Thanks guys

ItsStolas commented 6 years ago

Hey Ciaran,

I highly suggest going through this: https://learngitbranching.js.org/ It will really teach you a lot about git and how to use git bash. If you still have questions I am happy to try and help! :)

ashish2199 commented 6 years ago

@CiaranRoft Here are some useful links that might help you. how-do-i-update-a-github-forked-repository Syncing a fork

How to contribute ?

Once you have updated code on your computer you can make changes to code and once you feel they are good, you will need to commit them to repository in your profile(your fork).

Once you have done that you can submit a pull request to me and if it doesn't harm the existing design and functionality then I will merge your pull request in this repository and your changes will get incorporated in this repository. You will then become a contributor for this repository :)

If you face any troubles just reply here and we will be happy to help you.