search

gusbemacbe / suru-plus

Suru++ 25 — A cyberpunk, elegant, futuristic and Papirus-like third-party icons theme
GNU General Public License v3.0
337 stars 32 forks source link

I am unable of merging from unstable branch into master branch #49

Closed gusbemacbe closed 5 years ago

gusbemacbe commented 5 years ago

Hello @SmartFinn!

Is it safe to force to merge the unstable branch into the master branch when there are conflicts? GitHub said it can not merge automatically, but I can create a pull request.

Is it possible to remove the master branch and to create new branch from unstable branch, renaming to "master"?

SmartFinn commented 5 years ago

Try to merge it with the command:

git checkout master
git merge --strategy=ours unstable
SmartFinn commented 5 years ago

Sorry, I was much hurry. The command is wrong. Reset the master branch if you executed the command with git reset --hard origin/master

gusbemacbe commented 5 years ago

Do you mean:

git checkout master
git reset --hard origin/master

is it?

gusbemacbe commented 5 years ago

What if ...

git clone -b unstable --single-branch https://github.com/gusbemacbe/suru-plus
git checkout master
git reset --hard origin/master

?

SmartFinn commented 5 years ago

I see you merged the unstable branch. How you did it?

gusbemacbe commented 5 years ago

I found the tricks and I risked, but fortunately there were no problems. Here:

  1. I clicked "5 branches"
  2. I clicked "Change default branch" and changed "master" to "beta" as default.
  3. I saw that the branch "master" could be deleted without restriction and harms and I deleted the branch.
  4. At Code, I open "Branch: beta" and created the new branch from "beta", naming "master" without restrictions and problems.
  5. I changed from beta to master as default.