message no. 169382
Posted by localhorse in #github at 2017-06-03T06:35:50Z
how can i fix this mess? i was trying to sync my fork that was 14 commits behind using GitHub Desktop, but then it showed 1 commit ahead and still 14 behind. but i did "compare" and it showed it can merge, so i created a PR and merged it via the "rebase" option on the PR. but now it created even more commits and now it says 10 commits ahead, 14 behind :(( https://github.com/Boscop/rust-vst2/commits/master