Commit issues

[Nate004]

I am having problems pulling updates to my local repo. I can only update if these 2 commits are resolved. Kindly help. Thank you

The merge-base changed after approval.

[Elocodes]

hello Nate. I cannot merge the changes you referred to because they are already merged to main. This is also why you are seeing this "The merge-base changed after approval."

Regarding your statement "I am having problems pulling updates to my local repo. I can only update if these 2 commits are resolved. Kindly help. Thank you" Can you be a bit more specific? What is the exact error you see when you switch to the branch main and do a "git pull origin main" in your local repository?

[Nate004]

Hi Justina, thanks for the clarifications. The pull request is now successful but I still see that I have some commits to push. When I try pushing with Git push, I get the response:

remote: error: GH006: Protected branch update failed for refs/heads/main.
remote:
remote: - Changes must be made through a pull request.
To github.com:MIT-Emerging-Talent/ET6-foundations-group-11.git
! [remote rejected] main -> main (protected branch hook declined)
error: failed to push some refs to 'github.com:MIT-Emerging-Talent/ET6-foundations-group-11.git'

[Elocodes]

The error you have is because you are trying to push to the branch main. Since this is a team project, things can only be merged to main through a pull request. Here is the workflow that will fix your problem:

1. do a "git pull origin main" to get the updated changes to main into your local repository
2. switch to the branch you are working on through a "git checkout "branch name"
3. do a "git merge main" to pull the updates from main into your branch
4. do a "git push origin "name of branch" to send your branch to github
5. come to github and open a pull request on your branch
6. add it to project board
7. someone will review, and if everything is okay, they will merge it to main

I hope this clarifies it?

[Nate004]

Thank you Justina