git rebase, keeping track of ‘local’ and ‘remote’
When doing a git rebase, I often have difficulty working out what is happening with the ‘local’ and ‘remote’ when resolving conflicts. I … Read more
conflict
How can I discard remote changes and mark a file as “resolved”?
I have some local files, I pull from remote branch and there are conflicts. I know that I would like to keep my … Read more
Why is a 3-way merge advantageous over a 2-way merge?
Wikipedia says a 3-way merge is less error-prone than a 2-way merge, and often times doesn’t need user intervention. Why is this the … Read more
Android: View.setID(int id) programmatically – how to avoid ID conflicts?
I’m adding TextViews programmatically in a for-loop and add them to an ArrayList. How do I use TextView.setId(int id)? What Integer ID do … Read more