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.

Sign up for GitHub

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

Jump to bottom

Fetch upstream #9

Closed
cgbahk opened this issue Oct 1, 2021 · 4 comments
Closed

Fetch upstream #9

cgbahk opened this issue Oct 1, 2021 · 4 comments

Comments

@cgbahk
Copy link
Owner

cgbahk commented Oct 1, 2021

Due to amix#645
Need amix#650
@cgbahk
Copy link
Owner Author

cgbahk commented Oct 9, 2021

Made #10

There's conflict

What github suggest:

Step 1: From your project repository, check out a new branch and test the changes.

git checkout -b amix-master downstream
git pull https://github.com/amix/vimrc.git master

Step 2: Merge the changes and update on GitHub.

git checkout downstream
git merge --no-ff amix-master
git push origin downstream

@cgbahk
Copy link
Owner Author

cgbahk commented Oct 9, 2021

I did step 2 only, Wow #10 automatically merged!

@cgbahk
Copy link
Owner Author

cgbahk commented Oct 9, 2021 •
edited
Loading

Let's check whether these resolved

Due to amix#645
Need amix#650

@cgbahk
Copy link
Owner Author

cgbahk commented Oct 9, 2021

It's resolved!

@cgbahk cgbahk closed this as completed Oct 9, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
1 participant
@cgbahk