Merge conflict from blender-v3.6-release into main in io_scene_3ds/export_3ds.py #104619

New Issue

Damien Picard · 2023-05-22T13:43:10+02:00

Damien Picard commented

2023-05-22 13:43:10 +02:00

Hi @NRGSille, I made a commit for Sun Position in the blender-v3.6-release branch, and when I tried to merge it into main I ran into a merge conflict related to the 3DS exporter.

Could you have a look?

Hi @NRGSille, I made a commit for Sun Position in the `blender-v3.6-release` branch, and when I tried to merge it into `main` I ran into a merge conflict related to the 3DS exporter. Could you have a look?

Damien Picard added the

labels 2023-05-22 13:43:10 +02:00

Sebastian Sille was assigned by Damien Picard

2023-05-22 13:43:11 +02:00

Sebastian Sille commented

2023-05-22 14:05:44 +02:00

@pioverfour
I just pushed a code cleanup about 2 hours ago 084ea4fb7d
Your commit did not made any conflicts it seems

@pioverfour I just pushed a code cleanup about 2 hours ago [`084ea4fb7d`](https://projects.blender.org/blender/blender-addons/commit/084ea4fb7d26390f2ca8fd36fecaf56aa00daf3d) Your commit did not made any conflicts it seems

Sebastian Sille added reference blender-v3.6-release

2023-05-22 14:09:24 +02:00

Damien Picard commented

2023-05-22 14:11:31 +02:00

No, it’s unrelated to my commit. The issue appears to be that you cleaned up some comments in c0d93678 (3.6), and cleaned up the same comments in 6d4c6670 (main), but in a different way, so there is a conflict when merging 3.6 into main.

No, it’s unrelated to my commit. The issue appears to be that you cleaned up some comments in c0d93678 (3.6), and cleaned up the same comments in 6d4c6670 (main), but in a different way, so there is a conflict when [merging 3.6 into main](https://wiki.blender.org/wiki/Process/Using_Stabilizing_Branch).

Sebastian Sille commented

2023-05-22 14:15:32 +02:00

@pioverfour
Ah, okay now I understand, this should be fixed in blender-v3.6-release branch or in main ?

@pioverfour Ah, okay now I understand, this should be fixed in `blender-v3.6-release` branch or in `main` ?

Damien Picard commented

2023-05-22 14:23:23 +02:00

I would probably fix the conflict in main and leave 3.6 alone, but you it’s up to you if you want to add some changes from main back into 3.6!

Sebastian Sille commented

2023-05-22 14:30:39 +02:00

@pioverfour
The io_scene_3ds update for 3.6 is completed - I do not intend to merge main again into it.
The next cleanup will be the last before release, I will merge the cleanup changes from main into it

@pioverfour The io_scene_3ds update for 3.6 is completed - I do not intend to merge main again into it. The next cleanup will be the last before release, I will merge the cleanup changes from main into it

Julien Duroure commented

2023-05-22 14:46:28 +02:00

Hello ... Oops, sorry, I ran into the same issue, and I merged your code into main, trying to guess what needs to be merge.
Please have a look on it, to be sure I made it correctly.

Because all addons share the same repo, every change on your addon in 3.6 branch need to be merged into main, to avoid to block any other dev on the addon repo.

Hello ... Oops, sorry, I ran into the same issue, and I merged your code into main, trying to guess what needs to be merge. Please have a look on it, to be sure I made it correctly. Because all addons share the same repo, every change on your addon in 3.6 branch need to be merged into main, to avoid to block any other dev on the addon repo.

👍 1

Sebastian Sille commented

2023-05-22 15:05:19 +02:00

@JulienDuroure
no worries, I had a look and everthing is fine. I will have a look how to fix this issue

PS: To be honest, I do not know how to solve this conflict by now... can anyone help me with this?

Basically both scripts for main and v3.6 release are completed, I tried to revert the last changes but this does not solve the conflict

@JulienDuroure no worries, I had a look and everthing is fine. I will have a look how to fix this issue PS: To be honest, I do not know how to solve this conflict by now... can anyone help me with this? Basically both scripts for main and v3.6 release are completed, I tried to revert the last changes but this does not solve the conflict

Damien Picard commented

2023-05-22 18:01:52 +02:00

@NRGSille You seem to be having some difficulty with merging 3.6 into main. Can I help you with that?

What are you trying to do? Do you want to continue main from 6d4c6670?

Also, do you have access to blender.chat? It may be easier to fix this issue over there.

@NRGSille You seem to be having some difficulty with merging 3.6 into main. Can I help you with that? What are you trying to do? Do you want to continue main from 6d4c6670? Also, do you have access to blender.chat? It may be easier to fix this issue over there.

Sebastian Sille commented

2023-05-22 18:09:48 +02:00

@pioverfour
you are right, I caused a conflict and do not know how to solve it. It is because I pushed a cleanup in v3.6 branch 8161c7811 and later in main 6d4c667032 and they are not in sync. I just want to remove the conflict, the cleanup commits are not so important

PS: I have access to blender chat and I am online atm

@pioverfour you are right, I caused a conflict and do not know how to solve it. It is because I pushed a cleanup in v3.6 branch `8161c7811` and later in main `6d4c667032` and they are not in sync. I just want to remove the conflict, the cleanup commits are not so important PS: I have access to blender chat and I am online atm

Damien Picard commented

2023-05-22 18:38:39 +02:00

Fixed in 023cf27c25, the 3.6 branch was merged into main, without any change to main for the 3DS add-on.

Fixed in 023cf27c25, the 3.6 branch was merged into main, without any change to main for the 3DS add-on.

Damien Picard closed this issue

2023-05-22 18:38:40 +02:00

Blender Bot added

and removed