loading...

Discussion on: A Fool-Proof Way to Keep Your Fork Caught Up in Git

Collapse
jacobherrington profile image
Jacob Herrington (he/him) Author

That sounds like you need to make each of those commits on different branches.

If you didn't make a new branch when you created 'CmB', then you might have accidentally added that commit to the same branch as 'CmA' which would put it in the same Pull Request.

Collapse
kaushalgautam profile image
Kaushal Gautam

Thank you for the reply, Jacob. Yes, these were all on the master branch. Do you suggest I make separate branches for each of those changes? How does that work for many changes?

Thread Thread
jacobherrington profile image
Jacob Herrington (he/him) Author

What I do, is create a branch for each new feature. I usually have quite a few commits in each PR, but they are all for the same feature on what most people refer to as a 'feature branch' (meaning a branch specifically for that feature).

So if I'm going to fix some documentation, I'd make a branch from master called documentation-fixes.

git checkout master
git checkout -b documentation-fixes
git commit -am "Some doc fixes!"

Then when I got to implement a feature, I'd make a new branch from master:

git checkout master
git checkout -b some-new-feature
git commit -am "Some feature!"
Thread Thread
kaushalgautam profile image
Kaushal Gautam

I understand now. Thanks for such detailed explanations! They really help a lot. And congratulations on the new job! :)