Git and merged data
We are using git and we've set-up some projects using it. We don't use branches and now we run into the following:
I removed and added some test steps from a test case, commited and pushed it. My colleague wanted to pull my changes, but had to do a commit first (due to some changes he made) . Now, before he pushed, he pulled my changes. The strange thing is that he is still seeing my removed test steps. So when he commits and pushes my removed test steps are back? We do get some merge conflicts, but not about the removed test steps.
Any idea/tips how to prevent this?