We help IT Professionals succeed at work.
Get Started

git branching in github, contributing to a project

mikha
mikha asked
on
43 Views
Last Modified: 2020-02-22
I am new to this, but followed a guidelines for contributing open source .

steps -

1. Fork the project on Github.
2. clone it in my local machine
3. configured git locally, such that origin points to my fork  and upstream points to original repo.

Now I'm ready to create a branch from my fork/origin and start working on it.

If  at any point my local branch falls behind on commits to the original repo, as there are lot of contributors to the project.

How do I keep my local branch updated?

I would have to update the fork/origin first, then pull those changes to my local machine and
merge the master to my branch locally?

is that the general idea? I am new to git commands so if anyone can provide the steps and commands that would be great.

also, if there at any point there are merge conflicts , how is that resolved?
Comment
Watch Question
This question hasn't been answered yet.
While you wait, find out how you can maximize your capability with the most trusted tool in IT.
Explore More Ask a Question
Why Experts Exchange?

Experts Exchange always has the answer, or at the least points me in the correct direction! It is like having another employee that is extremely experienced.

Jim Murphy
Programmer at Smart IT Solutions

When asked, what has been your best career decision?

Deciding to stick with EE.

Mohamed Asif
Technical Department Head

Being involved with EE helped me to grow personally and professionally.

Carl Webster
CTP, Sr Infrastructure Consultant
Ask ANY Question

Connect with Certified Experts to gain insight and support on specific technology challenges including:

  • Troubleshooting
  • Research
  • Professional Opinions
Did You Know?

We've partnered with two important charities to provide clean water and computer science education to those who need it most. READ MORE