Closed agilob closed 8 years ago
@agilob Thanks a lot man!
Automatic merge failed as I edited conflicts with more recent master.. I'm closing this, changes are in fa03042b
Yup, I expected the merge conflict. Thanks for merging. I'll be working more on this project in the next couple of weeks.
Not all changes went there...
Any hints, how I could validate, e.g. gerenerate a report to compare which changes are missing?
I'm not too experienced with git, so I tried to merge manually and thereby probably missed something..
Hmm the easiest would be like:
git remote add agilob git@github.com:agilob/android.git
which adds my repo to your list of remote repositories on your local repo. do it in your git folder. You do it only once.git pull agilob <branchname>
git checkout agilob/<branchname>
git merge --no-ff agilob/<branchname>
(git checkout origin/master
before to go back to your branch). --no-ff option will always generate merge commit.
4.1 If you have merge conflicts, you should let me know, and I should solve themWhat we do here is git flow, you can read more about it here :)
There are some plugins to git that make some actions easier when working in github, but I'm much more fan of GitLab and at some point I'll try to convince you to move to gitlab.com :P
You should always use logger to log exceptions. printstacktrace always generates and bufferes stacktrace, but it's never printed in android so it's a huge was of resources.
Some exceptions don't provide message so getMessage will fail with NullPointerException, so prefer use of toString :)