I'll keep this post short. In the middle of trying to re-write code for my apps to support the newer Android firmware, in this case Android Oreo and up, I faced many (an understatement) problems trying to find workarounds and functional fixes. Thankfully, many developers have written and shared their problems, fixes, and migration strategies... Continue Reading →
What's an ANR in Android? Its when your application does not respond, it hangs, and eventually Android will display a prompt to the user to either force quit the app, or wait until the application responds. This is usually due to some thread or process in a waiting state, or the main UI thread is... Continue Reading →
So its a worldwide quarantine. Everyone is getting creative, perhaps cooking, painting, coding, exercising, other hobbies too. And that means there's curiosity to build and create. Whether you're learning a new framework or language, or you're building on top of what you know, or simply seeking to get better at something and build cool projects.... Continue Reading →
Its been a while since I posted a new tutorial, and better yet a data structure I haven't covered yet. So here is Trie. What I've seen is there are more interview questions regarding usage of Tries, so we'll cover implementation, usage and advantages, and some ideas for interview questions. What is a Trie? Also... Continue Reading →
In Visual Studio, if the remote contains work that you don’t have locally, and you try to do a push to that branch, you’ll see the following in Visual Studio Team Explorer:
The output window contains more information:
You’ll resolve this by clicking Pull
Visual Studio will automatically do any merges. Since there are were no conflicts, the auto-merge was successful and created a merge commit.
Now you can simply Push these changes up to the remote.
From the command line
Here’s what the corresponding scary message looks like from command line.
You’ll first want to Git Pull – which will result with Notepad prompting me to update my merge commit message if needed.
And now in Mortal Kombat fashion (I spelled Kombat right this time), you need to Finish It!
and do a Git Push.