How to merge while avoiding conflicts?

[iwissemben]

Hi, I have a question, regarding merging on git.

Once the modifications of 'documentation', 'Assignment_2' and 'Assignment_3' branches will be approved, i would like to know the best way to proceed to merge them, while avoiding conflicts.

Here's the situation:

• In documentation branch : I added new files (screencaps folder) in HELP folder and updated the ReadMe file of the main branch.
• in Assignment_2 branch : I modified multiple files (.py, .ipynb) from the SRC folder and added some (environment folder) in HELP folder.
• In Assignment_3 branch : I added a new 'ERSP_artificial.ipynb' to the SRC folder.

I also want to note that I created Assignment_3 branch from an earlier version of Assignment_2 it also contains old versions of the file of the parent branch Assignment_2`.

My intention was to merge documentation, then assignment_2 then Assignment_3 to main but I am sure there will be conflics with the SRC files. How should I proceed.