CODEWITHSUNDEEP
gitmerge
user1899082
user1899082

Reputation:

Merge my changes to the same branch as colleague

My friend and I have been working on the same branch. He has committed his changes to our branch, and now I want to do the same.

I already did a local git commit, but I'm not sure what are the steps from this point forward?

Upvotes: 0

Views: 171

Answers (1)

Schleis
Schleis

Reputation: 43760

You will want to get your branch up-to-date so that you can push your changes.

First you will do:

git pull --rebase

You can also just do git pull this will cause a merge commit to occur.

Then all you should need to do is:

git push

And the changes should be on the shared remote branch.

Upvotes: 1

Related Questions