search

TheCacophonyProject / bird-monitor

Android application to regularly record birdsong for analysis
GNU General Public License v3.0
11 stars 9 forks source link

Change app name #33

Closed timhot closed 5 years ago

timhot commented 5 years ago

Most of the changes are due to moving the files to a different package 'birdmonitor'

Before I tried to merge this branch, I also allowed Android Studio to upgrade Gradle on my PC which I think may have also resulted in lots of 'tidying up' of my code. Not sure if this is why I now get the message above "Can't automatically merge". Not sure what that now means for merging? Anyway, this code does work on my phone!

Suggestions very welcome.

mjs commented 5 years ago

With this branch checked out on your machine, try git pull --rebase origin/master.

That will re-apply these changes on top of the current master branch on Github. There will probably be some conflicts which you'll have to manually fix. When there's a conflict Git will pause the rebase. You then manually fix the conflicts (in a text editor or IDE) and git add the fixed up files. When all conflicts are fixed use git rebase --continue to continue the rebase. If there's multiple commits to apply then these pause-fix-continue steps can happen multiple times.

When the rebase is done, git push -f origin HEAD:change_app_name to update the rename PR on Github.

If you get stuck I can probably do the rebase for you.

timhot commented 5 years ago

I'm feeling useless :-( Here is what I tried

(base) tim@Unix1:~/StudioProjects/cacophonometer2/birdmonitor$ git checkout change_app_name Switched to branch 'change_app_name' Your branch is up to date with 'origin/change_app_name'. (base) tim@Unix1:~/StudioProjects/cacophonometer2/birdmonitor$ git pull --rebase origin/master fatal: 'origin/master' does not appear to be a git repository fatal: Could not read from remote repository.

Please make sure you have the correct access rights and the repository exists. (base) tim@Unix1:~/StudioProjects/cacophonometer2/birdmonitor$ git remote -v origin https://github.com/TheCacophonyProject/cacophonometer.git (fetch) origin https://github.com/TheCacophonyProject/cacophonometer.git (push) (base) tim@Unix1:~/StudioProjects/cacophonometer2/birdmonitor$

timhot commented 5 years ago

OK, I figured that I should have a space rather than / between origin_master. BUT what next?

(base) tim@Unix1:~/StudioProjects/cacophonometer2/birdmonitor$ git pull --rebase origin master From https://github.com/TheCacophonyProject/cacophonometer

.git/rebase-apply/patch:12668: new blank line at EOF. + .git/rebase-apply/patch:12856: new blank line at EOF. + warning: 3 lines add whitespace errors. Falling back to patching base and 3-way merge... Auto-merging app/src/main/res/values/strings.xml Auto-merging app/src/main/res/layout/fragment_testing.xml CONFLICT (content): Merge conflict in app/src/main/res/layout/fragment_testing.xml Auto-merging app/src/main/res/layout/fragment_sound.xml Auto-merging app/src/main/res/layout/fragment_rooted.xml Auto-merging app/src/main/res/layout/fragment_register.xml Auto-merging app/src/main/res/layout/fragment_manage_recordings.xml Auto-merging app/src/main/res/layout/fragment_groups.xml Auto-merging app/src/main/res/layout/fragment_frequency.xml Auto-merging app/src/main/res/layout/fragment_battery.xml Auto-merging app/src/main/res/layout/fragment_audio_source_settings.xml Auto-merging app/src/main/res/layout/activity_walking.xml Auto-merging app/src/main/res/layout/activity_vitals.xml Auto-merging app/src/main/res/layout/activity_setup_wizard.xml Auto-merging app/src/main/res/layout/activity_main2.xml Auto-merging app/src/main/res/layout/activity_disable.xml Auto-merging app/src/main/res/layout/activity_advance_wizard.xml Auto-merging app/src/main/java/nz/org/cacophony/birdmonitor/package-info.java Auto-merging app/src/main/java/nz/org/cacophony/birdmonitor/WelcomeFragment.java CONFLICT (content): Merge conflict in app/src/main/java/nz/org/cacophony/birdmonitor/WelcomeFragment.java Auto-merging app/src/main/java/nz/org/cacophony/birdmonitor/WalkingActivity.java Auto-merging app/src/main/java/nz/org/cacophony/birdmonitor/VitalsActivity.java Auto-merging app/src/main/java/nz/org/cacophony/birdmonitor/Util.java Auto-merging app/src/main/java/nz/org/cacophony/birdmonitor/TestingFragment.java Auto-merging app/src/main/java/nz/org/cacophony/birdmonitor/TestRecordFragment.java Auto-merging app/src/main/java/nz/org/cacophony/birdmonitor/StartRecordingReceiver.java Auto-merging app/src/main/java/nz/org/cacophony/birdmonitor/SoundFragment.java CONFLICT (content): Merge conflict in app/src/main/java/nz/org/cacophony/birdmonitor/SoundFragment.java Auto-merging app/src/main/java/nz/org/cacophony/birdmonitor/SignInFragment.java CONFLICT (content): Merge conflict in app/src/main/java/nz/org/cacophony/birdmonitor/SignInFragment.java Auto-merging app/src/main/java/nz/org/cacophony/birdmonitor/SetupWizardActivity.java CONFLICT (content): Merge conflict in app/src/main/java/nz/org/cacophony/birdmonitor/SetupWizardActivity.java Auto-merging app/src/main/java/nz/org/cacophony/birdmonitor/Server.java CONFLICT (content): Merge conflict in app/src/main/java/nz/org/cacophony/birdmonitor/Server.java Auto-merging app/src/main/java/nz/org/cacophony/birdmonitor/SectionsStatePagerAdapter.java Auto-merging app/src/main/java/nz/org/cacophony/birdmonitor/RootedFragment.java CONFLICT (content): Merge conflict in app/src/main/java/nz/org/cacophony/birdmonitor/RootedFragment.java Auto-merging app/src/main/java/nz/org/cacophony/birdmonitor/RegisterFragment.java CONFLICT (content): Merge conflict in app/src/main/java/nz/org/cacophony/birdmonitor/RegisterFragment.java Auto-merging app/src/main/java/nz/org/cacophony/birdmonitor/RecordAndUpload.java Auto-merging app/src/main/java/nz/org/cacophony/birdmonitor/Prefs.java Auto-merging app/src/main/java/nz/org/cacophony/birdmonitor/MultipartUtility.java Auto-merging app/src/main/java/nz/org/cacophony/birdmonitor/ManageRecordingsFragment.java CONFLICT (content): Merge conflict in app/src/main/java/nz/org/cacophony/birdmonitor/ManageRecordingsFragment.java Auto-merging app/src/main/java/nz/org/cacophony/birdmonitor/MainThread.java Auto-merging app/src/main/java/nz/org/cacophony/birdmonitor/MainService.java Auto-merging app/src/main/java/nz/org/cacophony/birdmonitor/MainActivity.java Auto-merging app/src/main/java/nz/org/cacophony/birdmonitor/LocationReceiver.java CONFLICT (content): Merge conflict in app/src/main/java/nz/org/cacophony/birdmonitor/LocationReceiver.java Auto-merging app/src/main/java/nz/org/cacophony/birdmonitor/InternetConnectionFragment.java CONFLICT (content): Merge conflict in app/src/main/java/nz/org/cacophony/birdmonitor/InternetConnectionFragment.java Auto-merging app/src/main/java/nz/org/cacophony/birdmonitor/IdlingResourceForEspressoTesting.java Auto-merging app/src/main/java/nz/org/cacophony/birdmonitor/GroupsFragment.java CONFLICT (content): Merge conflict in app/src/main/java/nz/org/cacophony/birdmonitor/GroupsFragment.java Auto-merging app/src/main/java/nz/org/cacophony/birdmonitor/GPSLocationListener.java Auto-merging app/src/main/java/nz/org/cacophony/birdmonitor/GPSFragment.java Auto-merging app/src/main/java/nz/org/cacophony/birdmonitor/FrequencyFragment.java CONFLICT (content): Merge conflict in app/src/main/java/nz/org/cacophony/birdmonitor/FrequencyFragment.java Auto-merging app/src/main/java/nz/org/cacophony/birdmonitor/ExecuteAsRootBaseTim.java Auto-merging app/src/main/java/nz/org/cacophony/birdmonitor/ExecuteAsRootBase.java Auto-merging app/src/main/java/nz/org/cacophony/birdmonitor/DisableActivity.java CONFLICT (content): Merge conflict in app/src/main/java/nz/org/cacophony/birdmonitor/DisableActivity.java Auto-merging app/src/main/java/nz/org/cacophony/birdmonitor/DawnDuskAlarms.java Auto-merging app/src/main/java/nz/org/cacophony/birdmonitor/CreateAccountFragment.java Auto-merging app/src/main/java/nz/org/cacophony/birdmonitor/BootReceiver.java Auto-merging app/src/main/java/nz/org/cacophony/birdmonitor/BatteryFragment.java CONFLICT (content): Merge conflict in app/src/main/java/nz/org/cacophony/birdmonitor/BatteryFragment.java Auto-merging app/src/main/java/nz/org/cacophony/birdmonitor/AudioSourceSettingsFragment.java CONFLICT (content): Merge conflict in app/src/main/java/nz/org/cacophony/birdmonitor/AudioSourceSettingsFragment.java Auto-merging app/src/main/java/nz/org/cacophony/birdmonitor/AdvancedWizardActivity.java Auto-merging app/src/androidTest/java/nz/org/cacophony/birdmonitor/UploadRecordings.java Auto-merging app/src/androidTest/java/nz/org/cacophony/birdmonitor/SignInUser.java Auto-merging app/src/androidTest/java/nz/org/cacophony/birdmonitor/RunUploadRecordings.java Auto-merging app/src/androidTest/java/nz/org/cacophony/birdmonitor/RunUnRegisterPhone.java Auto-merging app/src/androidTest/java/nz/org/cacophony/birdmonitor/RunSignInUser.java Auto-merging app/src/androidTest/java/nz/org/cacophony/birdmonitor/RunRooted.java Auto-merging app/src/androidTest/java/nz/org/cacophony/birdmonitor/RunRegisterPhone.java Auto-merging app/src/androidTest/java/nz/org/cacophony/birdmonitor/RunRecordSaveOnServer.java Auto-merging app/src/androidTest/java/nz/org/cacophony/birdmonitor/RunRecordSaveOnPhone.java Auto-merging app/src/androidTest/java/nz/org/cacophony/birdmonitor/RunGuiControls.java Auto-merging app/src/androidTest/java/nz/org/cacophony/birdmonitor/RunDeleteRecordings.java Auto-merging app/src/androidTest/java/nz/org/cacophony/birdmonitor/RunCreateAccount.java Auto-merging app/src/androidTest/java/nz/org/cacophony/birdmonitor/RunAllTests.java Auto-merging app/src/androidTest/java/nz/org/cacophony/birdmonitor/Rooted.java Auto-merging app/src/androidTest/java/nz/org/cacophony/birdmonitor/RegisterPhone.java Auto-merging app/src/androidTest/java/nz/org/cacophony/birdmonitor/Record.java Auto-merging app/src/androidTest/java/nz/org/cacophony/birdmonitor/HelperCode.java Auto-merging app/src/androidTest/java/nz/org/cacophony/birdmonitor/GuiControls.java Auto-merging app/src/androidTest/java/nz/org/cacophony/birdmonitor/DeleteRecordings.java Auto-merging app/src/androidTest/java/nz/org/cacophony/birdmonitor/CreateAccount.java Auto-merging app/build.gradle error: Failed to merge in the changes. Patch failed at 0001 Changed app name from Cacophonomter to Bird Monitor. Use 'git am --show-current-patch' to see the failed patch

Resolve all conflicts manually, mark them as resolved with "git add/rm ", then run "git rebase --continue". You can instead skip this commit: run "git rebase --skip". To abort and get back to the state before "git rebase", run "git rebase --abort".

timhot commented 5 years ago

Making progress.

I used Android Studio to list all files with conflicts, and opened each up in turn and accepted the 'change_app_name' version for each one, had to do this twice as you suggested might happen). Then I ran git rebase --continue as shown next:

(base) tim@Unix1:~/StudioProjects/cacophonometer2/birdmonitor$ git rebase --continue Applying: Changed app name from Cacophonomter to Bird Monitor. (base) tim@Unix1:~/StudioProjects/cacophonometer2/birdmonitor$ git push -f origin HEAD:change_app_name Username for 'https://github.com': timhot Password for 'https://timhot@github.com': Counting objects: 112, done. Delta compression using up to 12 threads. Compressing objects: 100% (99/99), done. Writing objects: 100% (112/112), 85.10 KiB | 4.48 MiB/s, done. Total 112 (delta 57), reused 0 (delta 0) remote: Resolving deltas: 100% (57/57), completed with 29 local objects. To https://github.com/TheCacophonyProject/cacophonometer.git

All looks good. BUT on On GitHub, the master branch says that the last commit was 2 days ago, I would have expected it to say a couple of minutes ago.

**** Ah, just noticed that it said I can now merge! I did and it looks good :-) Thanks Menno.

mjs commented 5 years ago

@timhot Nice work getting it sorted.

Regarding the confusing commit timestamps, I wonder if a rebase preserves the original timestamps of the commits.