I would like to force git to overwrite files in master from a branch, that it does not believe are changed.
Master Branch has file configA
Create branch from Master called BranchA which has file configA
Create Dev branch from Master called dev.
Make changes on dev, including changes to file configA
Merge changes from dev to master
Just get its content and commit it?
git checkout Master git checkout BranchA -- configA git commit -m "whatever"