Github Conflicts - Githubissues

zzzj15 / senior_design

1 stars 2 forks source link

Github Conflicts #9

Closed TBPer closed 11 years ago

TBPer commented 11 years ago

I amended once because there wasn't a lot of change in the code. When I try to commit later, it is rejected with "non-fast-forward". I google and it said i should do a pull request to fix the problem, and now i stuck with "conflicts" from merging....

@zsljulius I can work on this with you tmr

julius-datajunkie commented 11 years ago

Hey Per, You can simply do git push -f. THis will force the remote branch to accept whatever you pushed.

TBPer commented 11 years ago

Fixed!

Configured push > Force update

Capture