Help required with Git Worklow


#1

I already asked in IRC, so I’ll just paste the diff here.

[21:45] == adityaruplaha [[email protected]/web/freenode/ip.137.59.156.14] has joined #citra
[21:45] Hola! Can anyone help me out?
[21:45] I’m trying to rebase my master branch, but can’t do it
[21:46] I tried “git rebase upstream/master”
[21:47] Along with “git push origin master --force” & “git push origin master” too.
[21:48] I followed the instructions given here https://citra-emu.org/wiki/typical-git-workflow/


#2

Fixed it. Just updated the git global config variables.