Giter Club home page Giter Club logo

Comments (18)

EmperorYP7 avatar EmperorYP7 commented on July 2, 2024 1

@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.

from hg.

EmperorYP7 avatar EmperorYP7 commented on July 2, 2024 1

Please read CONTRIBUTING.md carefully.

from hg.

ankiiitraj avatar ankiiitraj commented on July 2, 2024 1

@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!

from hg.

ankiiitraj avatar ankiiitraj commented on July 2, 2024 1

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!

from hg.

LogMoss avatar LogMoss commented on July 2, 2024

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

from hg.

ankiiitraj avatar ankiiitraj commented on July 2, 2024

You can go ahead! Assigning this to you!

from hg.

EmperorYP7 avatar EmperorYP7 commented on July 2, 2024

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.

from hg.

Yashs911 avatar Yashs911 commented on July 2, 2024

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?

from hg.

Yashs911 avatar Yashs911 commented on July 2, 2024

@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?

from hg.

LogMoss avatar LogMoss commented on July 2, 2024

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

from hg.

Yashs911 avatar Yashs911 commented on July 2, 2024

@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

from hg.

Yashs911 avatar Yashs911 commented on July 2, 2024

@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?

from hg.

Yashs911 avatar Yashs911 commented on July 2, 2024

@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?

from hg.

Yashs911 avatar Yashs911 commented on July 2, 2024

@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?

from hg.

EmperorYP7 avatar EmperorYP7 commented on July 2, 2024

@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.

from hg.

Yashs911 avatar Yashs911 commented on July 2, 2024

@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?

from hg.

ankiiitraj avatar ankiiitraj commented on July 2, 2024

You need git push origin front-end

from hg.

Yashs911 avatar Yashs911 commented on July 2, 2024

@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.

from hg.

Related Issues (20)

Recommend Projects

  • React photo React

    A declarative, efficient, and flexible JavaScript library for building user interfaces.

  • Vue.js photo Vue.js

    🖖 Vue.js is a progressive, incrementally-adoptable JavaScript framework for building UI on the web.

  • Typescript photo Typescript

    TypeScript is a superset of JavaScript that compiles to clean JavaScript output.

  • TensorFlow photo TensorFlow

    An Open Source Machine Learning Framework for Everyone

  • Django photo Django

    The Web framework for perfectionists with deadlines.

  • D3 photo D3

    Bring data to life with SVG, Canvas and HTML. 📊📈🎉

Recommend Topics

  • javascript

    JavaScript (JS) is a lightweight interpreted programming language with first-class functions.

  • web

    Some thing interesting about web. New door for the world.

  • server

    A server is a program made to process requests and deliver data to clients.

  • Machine learning

    Machine learning is a way of modeling and interpreting data that allows a piece of software to respond intelligently.

  • Game

    Some thing interesting about game, make everyone happy.

Recommend Org

  • Facebook photo Facebook

    We are working to build community through open source technology. NB: members must have two-factor auth.

  • Microsoft photo Microsoft

    Open source projects and samples from Microsoft.

  • Google photo Google

    Google ❤️ Open Source for everyone.

  • D3 photo D3

    Data-Driven Documents codes.