When doing a git rebase, I often have difficulty working out what is happening with the ‘local’ and ‘remote’ when resolving conflicts. I sometimes have the impression that they swap sides from one commit to the next. This is probably (definitely) because I still haven’t properly understood. When rebasing, who is ‘local’ and who is … Read more
I have some local files, I pull from remote branch and there are conflicts. I know that I would like to keep my local changes and ignore the remote changes causing conflicts. Is there a command I can use to in effect say “mark all conflicts as resolved, use local”? 2 Answers 2
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 case? An example where a 3-way merge succeeds and a 2-way merge fails would be helpful. 4 Answers 4
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 I come up with so it doesn’t conflict with other IDs? 15 Answers 15
