why are my own commits to my own branch creating diffs in eGit (using eclipse with eGit to bitbucket)

73 Views Asked by At

Im going to post this question in a "for dummies" format as I am, in fact, a dummy.

Here is the process Ive been following and its killing me

I AM THE ONLY ONE WORKING ON THIS BRANCH

  1. Pull Master
  2. Create branch A
  3. Make changes to Branch A
  4. Commit and Push Branch A
  5. Hold code review...changes are required from code review
  6. Pull Branch A (eGit reports no changes)
  7. update Branch A with required changes
  8. Commit and Push Branch A **** egit rejects and reports non-fast forward. eGit shows the same number of changes in orgin/Branch A now as i made in remote/Branch A
  9. Branch A pull - eGit now pulls a change and creates a merge commit
  10. i can now successfully push my change (although I have to amend the merge commit message due to formatting requirement)
1

There are 1 best solutions below

0
TheUltimateHack On

figued out that in eGit i was accidentally creating a merge commit using the ammed button. I thought the ammed button was just allowing me to edit the message, not create a new commit