I have create feature branch test and push commit 'Test1' to it. Next I have changed names of files in this commit and amend changes to commit 'Test1' locally.
The goal I want to achieve is to push this changes to remote feature branch where will be also then one commit with my changes.
My problem: When I tried to push my amended commit git told me that I had old changes. So I pull changes from remote. But then I had merge commit locally. If I push this commit and merge to remote will I have 3 commits? First one, amended and merge ? o.O
How can i achieve my goal ?