[git-users] git amend wont merge

2020-12-01 Thread SJW
I had a bug in my code so I branched master to `bugfix-333` and I added a `var_dump();` in the code to debug. I then found the problem, fixed it, committed and merged `bugfix-333` into `staging` branch. I then realised that I'd left the `var_dump();` in the code so i checked out the

[git-users] Substitute Keywords in file during commit

2020-12-01 Thread Scott Vodicka
I am running git on Windows, and the below question applies when I'm committing to the local repository. I have a requirement to substitute keywords in a program header when the file is committed. From what I am finding it looks like I need to use a filter. My plan is to have the filter run