[vim/vim] Makefile changes (#4376)

[DNSGeek]

For those of us that have customized makefiles, it's really painful every time the makefile is updated to have to go back through and apply the customizations after a git pull. Recently this has been happening several times a week. It's not fun.

—
You are receiving this because you are subscribed to this thread.
Reply to this email directly, view it on GitHub

[K.Takata]

Do you use git stash?

[Christian Brabandt]

I am not sure what you want us to do here. Certainly not, that makefiles are not changed anymore. However, what I have been doing is using git pull --rebase. That will keep your local commits on top of the upstream changes.

Closing, as this is clearly not a Vim issue.

[Christian Brabandt]

Closed #4376.

[Tony Mechelynck]

What concerns Vim makefiles, I don't custdomize them, and in shadow directories I even replace the copies of src/Makefile by links to it. My configure arguments are set by means of environment variables.

Best regards,
Tony.

[John Little]

I suggest making your changes in your own git branch. My workflow is

git checkout master
git pull
git checkout john
git merge master

I find this cleaner and more flexible than git stash.