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

Add quote in the footer #97

Closed
ankiiitraj opened this issue Sep 26, 2020 · 18 comments · Fixed by #130
Closed

Add quote in the footer #97

ankiiitraj opened this issue Sep 26, 2020 · 18 comments · Fixed by #130
Assignees
Labels

Comments

@ankiiitraj
Copy link
Member

Description

Add the quote Made with ❤️ and open-sourced or something like this in the footer

Screenshots/testimonials

@LogMoss
Copy link
Contributor

LogMoss commented Sep 26, 2020

I'd like to fix this issue. To be clear, is it and open-sourced or and open-source?

@ankiiitraj
Copy link
Member Author

You can go ahead! Assigning this to you!

@EmperorYP7
Copy link
Member

I dont think we should be adding this line. But anyways, let's see how @erkska implements it. Made with ❤️ and open-sourced will be fine.

@Yashs911
Copy link
Contributor

hg
@ankiiitraj I have made the changes and will create a PR on 1st Oct because of hacktoberfest. Do I need to add anything else?

@Yashs911
Copy link
Contributor

@ankiiitraj @EmperorYP7 I tried creating a PR for this issue but when I click Pull Request I see both my new commit and my previous commit(Adding padding one). I am new to open source can you tell me what should I do?

@LogMoss
Copy link
Contributor

LogMoss commented Sep 27, 2020

Excuse me, but I'm assigned to this issue and working on it. @Yashs911

@Yashs911
Copy link
Contributor

@erkska Sorry, I will not create the PR (I thought its already 15hr so I made the changes).
P.S. I am new to open source

@EmperorYP7
Copy link
Member

@Yashs911, the following commands might help.

git remote add upstream https://github.com/houseofgeeks/hg.git
git pull upstream front-end <your dev-branch>
git push origin <your dev-branch>

@erkska All the beginner issues are open for all, regardless of who is assigned. We promote collaboration over competition.

@Yashs911
Copy link
Contributor

@EmperorYP7 I am doing all changes in the main branch. I know I should have created a separate branch so in what should I write?

@EmperorYP7
Copy link
Member

Please read CONTRIBUTING.md carefully.

@Yashs911
Copy link
Contributor

@EmperorYP7 I am trying to set up upstream but after "git pull upstream master" I am getting a merge conflict (both added ) for few files. What should I do?

@ankiiitraj
Copy link
Member Author

ankiiitraj commented Sep 27, 2020

@EmperorYP7 I am trying to set up upstream but after "git pull upstream master" I am getting a merge conflict (both added ) for few files. What should I do?

So if you are working on front-end use git pull upstream front-end --rebase
If there are conflicts try to resolve them and you are good to go!

@Yashs911
Copy link
Contributor

Yashs911 commented Sep 27, 2020

@ankiiitraj I have created an upstream/front-end remote each time I want to contribute I will "git pull" in the front-end branch and then create a separate branch and do the work and push from that branch.
Am I right?

What if while I was working someone changed the main repo?

@EmperorYP7
Copy link
Member

@Yashs911 You may directly commit to Yashs911:front-end branch and pull the new changes from houseofgeeks:front-end periodically to keep your side up to date. You may refer to this video for detailed explanation.

@Yashs911
Copy link
Contributor

Yashs911 commented Sep 28, 2020

@EmperorYP7 I watched the video and have understood most of the things. So according to me, I have to
git pull upstream front-end
git add (if any conflict)
git push origin front-end
and then create a branch and do the work and that's it.
One last doubt while pushing the work what command do I need to write just "git push" or "git push origin front-end"

In the video you write master so do I also need to write master or the main branch in my repo?

@ankiiitraj
Copy link
Member Author

You need git push origin front-end

@Yashs911
Copy link
Contributor

Yashs911 commented Sep 28, 2020

@ankiiitraj @EmperorYP7 I have figured out the whole syncing process thanks a lot for your help and guidance.

My last question is: Is it possible to create a commit today and Issue a PR later like after 1 week. If in between the main repo get updated will it be a problem?

And I am currently using windows and aiming for GSoC 2021/2022 So should I switch to Linux or any other advice you can provide.

@ankiiitraj
Copy link
Member Author

ankiiitraj commented Sep 28, 2020

You can do is open a PR in draft mode and open it for review whenever you want!
There's a ton of videos on youtube about the benefits of using Linux over windows especially for development. You can watch those!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging a pull request may close this issue.

4 participants