Permalink
Checking mergeability…
Don’t worry, you can still create the pull request.
Comparing changes
Choose two branches to see what’s changed or to start a new pull request.
If you need to, you can also or
learn more about diff comparisons.
Open a pull request
Create a new pull request by comparing changes across two branches. If you need to, you can also .
Learn more about diff comparisons here.
...
- 12 commits
- 73 files changed
- 3 contributors
Commits on Apr 8, 2018
Commits on Apr 24, 2018
Commits on May 3, 2018
Commits on Jun 4, 2018
Commits on Jun 5, 2018
-
-
Merge remote-tracking branch 'origin/master'
# Conflicts: # app/src/main/AndroidManifest.xml # app/src/main/java/com/example/cj/videoeditor/MyApplication.java # app/src/main/java/com/example/cj/videoeditor/activity/MainActivity.java # app/src/main/java/com/example/cj/videoeditor/activity/VideoConnectActivity.java # app/src/main/java/com/example/cj/videoeditor/drawer/VideoDrawer.java # app/src/main/java/com/example/cj/videoeditor/mediacodec/AudioRunnable.java # app/src/main/java/com/example/cj/videoeditor/mediacodec/MediaMuxerRunnable.java # app/src/main/java/com/example/cj/videoeditor/mediacodec/VideoRunnable.java # app/src/main/res/layout/activity_main.xml
-
Commits on Jun 10, 2018
Commits on Aug 27, 2019
Commits on Sep 20, 2021
Loading
This comparison is taking too long to generate.
Unfortunately it looks like we can’t render this comparison for you right now. It might be too big, or there might be something weird with your repository.
You can try running this command locally to see the comparison on your machine:
git diff master...master