SyntaxFix
Write A Post
Hire A Developer
Questions
For Android Studio and IntelliJ:
First, commit everything and resolve any conflicts.
Then open the terminal from below of IDE and enter:
git pull origin master --allow-unrelated-histories
Now you can push.