git branchUpdated Pull Request Protocol
Background
Due to an encountered issue pulling in new updates for CytometryInR when you have an optional take-home problem still waiting to be reviewed, we will be modifying the protocol for submitting a pull request. You will first create a local homework branch, and submit from your branch to our homework branch. That should hopefully prevent any incoming changes from main to main from becoming conflicted.
Getting Started
The first step is to open Positron, and navigate through the dropdown options to the Create a Branch option
And provide a name (since the homework was for Week 02, we set it as Week 02)
Next, select the option to Publish the Branch
From here, importantly, select the option to make it a branch of YOUR forked CytometryInR version (since you don’t have permissions for the main course repository)
At this point, your new branch will have been created. You can check by entering the following code in the terminal, and verifying the * is next to the Week02 branch
Once you have confirmed you are in your homework branch, go ahead and transfer in all the files you will be submitting for the optional take-home problems
And once done, make a commit as you would normally
As you can see, you will now be ahead of the main branch by one commit. Go ahead and sync your branch to GitHub so the contents are available remotely for use in the pull-request.
Once synced, you will notice that your branch is now up to date with the remote (cloud) icon. Next, proceed to checkout to the main branch, either via the dropdown or via the terminal using
git checkout main
Returning to GitHub, you will see that your homework branch has received the incoming changes. You are now safe to sync your fork to bring in changes from the main course CytometryInR repository.
And confirm yes.
Returning to Positron, once verified you are in your main branch, proceed to pull in changes
If you switch between branches, you will notice you have both the new changes to main, as well as your week specific side branch co-existing peacefully.
You are then safe to make a pullrequest from your homework branch, to our homework branch, without running into risk of an additional commit from our end (or delay in reviewing) causing issues.
Additional Resources
This method should hopefully avoid the previously encountered issues. Apologies once again to those who encountered the issue! Still learning how to use some of these aspects of Version control in a GitHub context.
