G
G
Gary_Ihar2021-01-14 14:33:23
git
Gary_Ihar, 2021-01-14 14:33:23

How to merge a branch while ignoring one commit?

Hello.
There is a branch 1 - the main one.
There is a branch 2 - the top developer sits in it.
There is a branch 3,4,5,6... - mine and others.
What's the point. Branches 3,4,5... make pull requests to branch 2, they are checked there and from there to branch 1.
The trouble is that the application can be deployed under a different version of one file for everyone whose branch is 3,4,5. .. They all commit by editing this file in order to deploy the application to themselves.
Now here's the question itself. How, without a git ignore in a pull request, would a dude on branch 2 ignore that one commit with a version change and accept everything else.
Or git can't do that? I just couldn't even google correctly.

Answer the question

In order to leave comments, you need to log in

1 answer(s)
A
Antony, 2021-01-14
@Gary_Ihar

If you do not need this commit - what does it do in the repository at all and why was it merged?
Well, you make a branch for yourself and cherrypick all the commits you want into it (you can not make a branch, but in a conditional dev branch, copy all the necessary commits)
so stop ... read it again carefully.
Why do you have environment-specific configuration files at all in a common repository with code? Get yourself a devops.

Didn't find what you were looking for?

Ask your question

Ask a Question

731 491 924 answers to any question