CODEWITHSUNDEEP
gitgithubmergegit-pull
Madhan
Madhan

Reputation: 5818

Github n Commits 0 Files changed

My Github Repo

I forked a repo and did some changes. Then I created a PR and successfully merged with the Main/Master Repo.

While Merging I chose the Squash Merge Option.

Now my Froked repo shows

This branch is 14 commits ahead, 1 commit behind CognizantQAHub:master.

When I compared for the changes It is showing

14 commits 0 files changed

What is the meaning of that? That means Only My Files got merged with the Main Repo?

How to make sure both Main repo and Forked repo in sync with each other?

Do I need to create a PR Again?

Upvotes: 1

Views: 2810

Answers (1)

kan
kan

Reputation: 28951

You have the same thing changed twice - as 14 commits and as a single squashed commit. Contents is the same, history is different. Most probably you should just drop your commits and reset your fork to main repo branch.

Upvotes: 1

Related Questions