Q
Q
Qwertman2017-10-31 14:06:05
git
Qwertman, 2017-10-31 14:06:05

How to bring the local master to the volume in the github?

Foolishly worked in the master, committed but didn't push, wanted to get all the updates, used
git pull --rebase origin master
This is how I usually get changes in if I work in the master.
Now it turns out that it's easier to manually add all the changes to the version on the git in the wizard than to resolve conflicts.
Now I made a branch from the master so that you can peep your changes.
How to bring the master to mind on the gita?

Answer the question

In order to leave comments, you need to log in

2 answer(s)
S
Sergey Andreev, 2017-11-14
@Qwertman

How to bring the master to mind on the gita?

git checkout master
git fetch --all
git reset --hard origin/master

Y
youngmysteriouslight, 2017-11-02
@youngmysteriouslight

Now I made a branch from the master so that you can peep your changes.
So you aborted the rebase and saved your commits, the head of the new branch points to the latest commit?
How to bring the master to mind on the gita?
On github ? Ie, on the central repository?
Then roll back master (git reset master <commit hash, which is locally and remotely>) and do a git pull.

Didn't find what you were looking for?

Ask your question

Ask a Question

731 491 924 answers to any question