Bug? 2 people using GIT - add modules

[JakeBullet70]

I saw this today.

Me and my son each added a few new modules (classes and a service) and on a GIT merge it failed. I think because the modules can change places and the module count is also wrong.

 

[Erel]

If you are using B4A v3.8+ then you should make sure not to include the meta file. The purpose of the meta file is to store all the "dynamic" data in a separate file.

 

[JakeBullet70]

I am using 3.82 and not including the META file. I think the issue is when 2 people add modules.

 

[Erel]

If you are adding new modules in two different computers then you will need to manually merge the project and correctly update the b4a file. This is expected.

The project structure is quite simple. You should be able to update it with a text editor.

 

[JakeBullet70]

OK, that's what I did.

 

[Thraka]

The main problem is actually the list of modules. It seems to reorder them now and again and that causes lots of conflicts when new modules are added. It's hard to fix these merge because you have to really pay attention to what is going on.

Because it uses an INI style format for identifying files in the project, if we both happen to add a new modules between commits, it causes a big problem because the counts are correct but we'll have to hand edit and increase the count and add the conflicting file by hand during the merge.

 

[JakeBullet70]

Yep, that's what is happening