Return to Answer

Version numbers are not quite part of the code. I'd rather say it is meta information and ideally shouldn't be in the repository with the source code. It should be added only in the build phase. But the world isn't an ideal place, so sometimes you need to have the version hard-coded.

For these cases, it is expected to have version conflicts when merging different versions. This is fine and shouldn't make you uncomfortable.

In these cases, I minimize the number of places where the version is stored. Ideally, it is only in one specific file that contains only the version and nothing else.

You can solve this conflict manually, but the better decision would be to write some custom merge driver to solve these type of conflicts automatically. Example of such a driver is in this answer.

Version numbers are not quite part of the code. I'd rather say it is meta information and ideally shouldn't be in the repository with the source code. It should be added only in the build phase. But the world isn't an ideal place, so sometimes you need to have the version hard-coded.

For these cases, it is expected to have version conflicts when merging different versions. This is fine and shouldn't make you uncomfortable.

In these cases, I would minimize the number of places where the version is stored. Ideally, it is only one specific file that contains only the version and nothing else.

You can solve these conflicts manually, but the better decision would be to write some custom merge driver to solve this type of conflicts automatically. Example of such a driver is in this answer.

The version numbers not quite a part of code. I'd rather say it is meta information and ideally shouldn't be in the repository alongside with the source code. It should be added only on the building phase. But the world isn't ideal place so sometimes indeed you need to have the version hard coded in your code.

For these cases it is expectable and fine to have version conflicts on merging different versions. This fact shouldn't make you uncomfortable.

I would minimize the number of places where version is stored. Ideally it would be one particular file which contains only the version and nothing else.

You can solve this conflicts by hands, but the better decision would be to write some custom merge driver to solve that type of conflicts automatically. Example of the driver you can see in this answer.

Version numbers are not quite part of the code. I'd rather say it is meta information and ideally shouldn't be in the repository with the source code. It should be added only in the build phase. But the world isn't an ideal place, so sometimes you need to have the version hard-coded.

For these cases, it is expected to have version conflicts when merging different versions. This is fine and shouldn't make you uncomfortable.

In these cases, I minimize the number of places where the version is stored. Ideally, it is only in one specific file that contains only the version and nothing else.

You can solve this conflict manually, but the better decision would be to write some custom merge driver to solve these type of conflicts automatically. Example of such a driver is in this answer.

The version numbers not quite a part of code. I'd rather say it is meta information and ideally shouldn't be in the repository alongside with the source code. It should be added only on the building phase. But the world isn't ideal place so sometimes indeed you need to have the version hard coded in your code.

For these cases it is expectable and fine to have version conflicts on merging different versions. This fact shouldn't make you uncomfortable.

I would minimize the number of places where version is stored. Ideally it would be one particular file which contains only the version and nothing else.

You can solve this conflicts by hands, but the better decision would be to write some custom merge driver to solve that type of conflicts automatically.

The version numbers not quite a part of code. I'd rather say it is meta information and ideally shouldn't be in the repository alongside with the source code. It should be added only on the building phase. But the world isn't ideal place so sometimes indeed you need to have the version hard coded in your code.

For these cases it is expectable and fine to have version conflicts on merging different versions. This fact shouldn't make you uncomfortable.

I would minimize the number of places where version is stored. Ideally it would be one particular file which contains only the version and nothing else.

You can solve this conflicts by hands, but the better decision would be to write some custom merge driver to solve that type of conflicts automatically. Example of the driver you can see in this answer.