Working simultaneously and independently from Lesly’s tasks leads to what feels a bit like a battle between my PR’s being merged and hers. If we end up pushing at the same time, then whoever gets merged first makes the other PR have to have a branch update.

Maybe I’m just ignorant but why does my PR cause a conflict if main is behind? I thought only the files I edit/create get merged into main. Does that really affect anything done after Lesly’s branch is merged? Would my PR overwrite changes added from Lesly’s? If that’s really the case then I feel I’m at a loss.

I assumed taking a compartmentalized approach meant we both could push and merge whenever and not be affect by each other’s work. With her handling the backend and myself handling front end, we don’t really touch each other’s files that I can tell. Maybe there’s overlap from time to time, but I really figured I was mostly coding in a vacuum and just called Lesly’s work when needed.

Again, maybe I’m just ignorant at how programming functions as a team. I know on my last team project, we did have an issue with a team member who was trying to develop a login file but proceeded to disappear. I wound up taking up that load, but once the other team member returned; his repo was outdated and merging his push would have overwritten a lot of work we accomplished in his absence.

That’s the only event I’ve experienced with a merge conflict. So I hope we can get things a bit sorted out, because now I am actually worried we are starting to lose time, and I can’t accomplish my tasks.