Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Git Tutorial #11

Open
raymondcylee opened this issue Sep 11, 2019 · 0 comments
Open

Git Tutorial #11

raymondcylee opened this issue Sep 11, 2019 · 0 comments

Comments

@raymondcylee
Copy link
Owner

raymondcylee commented Sep 11, 2019

Screenshot 2019-09-11 at 3 25 17 PM

On the above screenshot, raymond2 branch was checked out from an outdated master branch.

Remote master branch has already been updated with a new commit, namely "not stupid test".

Step 1 - Update your local master

Make sure you switch to master branch, then run git pull origin master

Screenshot 2019-09-11 at 3 28 43 PM

Step 2 - Rebase raymond2 onto master

Screenshot 2019-09-11 at 3 29 30 PM

As the result, you see this:

Screenshot 2019-09-11 at 3 29 49 PM

Step 3 - force push raymond2 branch to replace remote raymond2

git push origin raymond2 -f

Screenshot 2019-09-11 at 3 32 06 PM

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

1 participant