troubleshooting Question

git making two commits when branch is behind

Avatar of Rohit Bajaj
Rohit BajajFlag for India asked on
Git
1 Comment1 Solution121 ViewsLast Modified:
Hi,
I have made a local commit to the repo.
The remote branch is ahead by one commit. So I forgot to take the pull and commit my changes to local.
I did a git pull and git push
I saw the following 2 commits in the branch. The last one is weird.
whats the need for that to be created. how can i avoid that ?
So here my local branch was on 1f6a commit
and the origin was at 0ca commit

when i tried to push i got the error message :
On branch stage
Your branch and 'origin/stage' have diverged,
and have 1 and 2 different commits each, respectively.
  (use "git pull" to merge the remote branch into yours)

after performing git pull i did git commit
and the top two commits were produced. Ideally only one commit should have
produced that of Remove nanosecond message.
How to avoid this top commit.
commit treeOne way is to uncommit your latest change and then take a git pull
How to uncommit the lates change that is in local ?

This problem is mainly coming when i am committing something and the origin branch is
ahead of local branch.
The Merge branch 'stage' of 10.1.5.12:app-portal into stage commit
which was automatically created has this in it. It shows two parents !!
parent
Thanks
ASKER CERTIFIED SOLUTION
Kelvin McDaniel
Owner/Consultant/Sr. Engineer

Our community of experts have been thoroughly vetted for their expertise and industry experience.

Join our community to see this answer!
Unlock 1 Answer and 1 Comment.
Start Free Trial
Learn from the best

Network and collaborate with thousands of CTOs, CISOs, and IT Pros rooting for you and your success.

Andrew Hancock - VMware vExpert
See if this solution works for you by signing up for a 7 day free trial.
Unlock 1 Answer and 1 Comment.
Try for 7 days

”The time we save is the biggest benefit of E-E to our team. What could take multiple guys 2 hours or more each to find is accessed in around 15 minutes on Experts Exchange.

-Mike Kapnisakis, Warner Bros