1

I was working on a project and after every commit, I had to make the server up locally and test the changes.

There were few config changes in order to make the server up locally. Hence, I made the config changes first and introduced it as a new commit.

Then, I made the actual project changes. Here's the list of commits I have introduced. (Let's say)

git commit -am "config changes to make the server up in LOCAL"

git commit -am "added prod changes 1"

git commit -am "added prod changes 2"

git commit -am "added prod changes 3"

Now, If I have to push these changes to prod, I am in big trouble. I do not want the LOCAL commits to be present. This again adds some work while code reviews or when merging with the master branch. (Undoing config changes)

These local config changes are quite common for testing purposes and I have to make these changes for every change if it requires running the server locally.

Is there any way I can use git functionality in order to reduce this repetitive task?

My thought is to use git stash to save the config changes and apply those while testing.

Any better ways would be greatly helpful. Thanks in advance!

Note: I am not asking how to delete or undo that commit.

unknownerror
  • 2,235
  • 2
  • 25
  • 26
  • 1
    Does [this question](https://stackoverflow.com/questions/1753070/how-do-i-configure-git-to-ignore-some-files-locally?rq=1) or [this answer](https://stackoverflow.com/a/13631525/3225495) help? – BJ Myers Dec 07 '17 at 19:12
  • @BJMyers, `--skip-worktree` worked for my usecase. But there are few cases when I might have to do `--no-skip-worktree`. That's fine and better than using stash. thanks! – unknownerror Dec 15 '17 at 19:54

0 Answers0