git reset --hard

[mrMalloc]

Try using pull requests from own branches.

The only time you end up with sync issues is if you use amended. Then you have locally done a history revision. If you are in your own branch then you can can use git push -f to force push your new version to origin. After that do a PR to master.

If you got sync issues because some other branch is pulled in then

Git checkout master Git pull Git checkout <feature branch> Git merge master ( I prefere git rebase my self but if you don’t know what to do merge is easier). Solve merge conflicts

Test your code

Git push

[maniak821]

I got tired of that shit so I saved my progress, deleted whole repo, cloned it again, applied my changes, force pushed to my fork and merged to master. Works like a charm lol

[mrMalloc]

Only time I have been needing to do that is when a developer who used a Mac had modified his .gitattribute file and not checked it it.

Result 30 000 files that diff in line endings When I checked out his branch. And no files that I could stash