Commit after merge problem
Created originally on Bitbucket by Defero
Hi,
So i made some changes to our code and committed them and then pushed them onto the server.
Then somehow these changes were removed from the server, and after i updated everything, i was back where i started.
So i merged my previus commited branch in my repository with my current working directory. The problem i have now is that cannot commit if i wan't to push this things onto the server again, i should have to be able to commit them somehow. And yes when i go to the commit window, these files have M next to them, and i can commit them, and push them.
BUT i don't wan't to push all the files onto the server since some are config files and some binary but i can't uncheck them because the commit window doesn't show the checkboxes.
How would i go about resolving this?
Thank you in advance
Attachments: Example