In Visual Studio, I can easily take the current (or incoming) branch's changes while resolving merge conflicts. This is like merging with --ours (or --theirs) merge strategy for a single file. Could someone please tell me how I would do…
I am automating app deployments by making use of AWS CLI commands. However, the problem is that when the AWS command is fired and is completed, the next command in the script is not executed. This is because the command…
I'm developing PHP on Windows machine and due to various old project I need to switch PHP version frequently. I wrote a script that edits $PATH environment variable and it works without a problem. I'm using Git Bash as a…
I have created a repo within cPanel, cloned it to my local computer and then added some files. Now when i push the commits back up, everything seems to work nicely. However, the cPanel filemanager shows no files in the…
I want to deploy my git repository in cpanel. As far as I know to do that I need .cpanel.yml file with several commands in it. My file: --- deployment: tasks: - export DEPLOYPATH=/home/ygolokru/public_html/testForsite/ - /bin/cp * $DEPLOYPATH However it…