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
- Pull Master
- Create branch A
- Make changes to Branch A
- Commit and Push Branch A
- Hold code review...changes are required from code review
- Pull Branch A (eGit reports no changes)
- update Branch A with required changes
- 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
- Branch A pull - eGit now pulls a change and creates a merge commit
- i can now successfully push my change (although I have to amend the merge commit message due to formatting requirement)
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