Lab03 - GitHub pull request conflicts

[CTNovoa]

I am receiving the following message when attempting to merge my branch into the main GitHub branch for Lab03, any advice on next steps to best resolve this in a way that appropriately maintains everyone's work within the project? I very closely followed the Lab03 tutorial video (it was very helpful, thank you!) so I am not sure why this error arose.

Thank you for your assistance!

[castower]

Hello @CTNovoa ,

It looks like the latest version of the renv.lock file wasn't pulled to your branch before the pull request as the branch is 13 commits behind main.

To resolve this, you can move your updated Lab 3 files to a separate folder (just to be sure there's no issues with the commit process). Then create a new branch, fetch to ensure it matches main, add your updated files back to the wk03 folder and then complete the pull request.

You can then re-update the renv.lock file if needed.

Let me know if you run into any further issues!

[CTNovoa]

Thank you for the thoughtful and quick response, your help is so appreciated!

Okay, I moved the following items to a new folder in the Documents folder of my File Explorer, and thus they are pulled out of the wk3 lab folder:

Additionally, this is probably a somewhat silly clarification, but I get very concerned about potentially messing something up in GitHub that harms my other group members, but which option is best for me to select here?

[castower]

@CTNovoa I definitely understand! You'll want to create the new branch from main so it will have the 13 commits that your current branch is missing.

You can then add your files back to the week 3 folder if they don't appear for committing to the new branch.

[CTNovoa]

Okay, I think I have everything good to go now, thanks to your help!