Positron Merge issue

[lkisselbach-afk]

Hi,

I'm trying to stage and commit my week 4 take-home problems, and there is some merge issue in the CytometryInR folder that is preventing it.

[DavidRach]

Hi @lkisselbach-afk , sorry for the late reply. This looks to be the issue from the homework submission issue. First, make sure all your individual homework folders for all the weeks are backed up elsewhere on your computer so that none of your effort is lost.

Is this current view from a branch? You can check by entering in the terminal

git branch

To check whether you are in your branch or main.

Best-
David

[lkisselbach-afk]

Hi David,

There seems to be a conflict in the CytometryInR folder and it's preventing me from creating a Branch in there. I can create a Branch in my own folder, but I don't know how to get it to the CytometryInR folder as a branch.

Lynn

[lkisselbach-afk]

Hi David,

I was able to circumvent the issue by reloading CytometryInR in Positron. You should see pull requests for my homework from weeks 3-6 that were submitted yesterday (25Mar2026). Please ignore the previous pull requests for weeks 3 & 4 from me, as I was still trying to work through the issues I had on my end.

Thanks,
Lynn