Skip to content
This repository has been archived by the owner on Sep 16, 2022. It is now read-only.

WIP: Merge upstream master #1

Open
wants to merge 39 commits into
base: feature/rollback-destruction
Choose a base branch
from

Conversation

linkabi9
Copy link

No description provided.

passsy and others added 19 commits October 13, 2018 06:02
Until now, commits in baseBranch where incrementing the version although the content of a commit in featureBranch hasn’t changed and doesn’t include changes from baseBranch
…_commits

Ignore commits in baseBranch after branching off a feature branch
Upgrade gradle and use standard maven publishing
Prevents hang during `git status` for large output
Don’t crash on commit without symbolic-ref
@linkabi9 linkabi9 self-assigned this Jul 17, 2019
Tobias Neubert and others added 10 commits August 28, 2019 14:47
Remove any prefix of a branch name separated by a slash like /feature…
Android Studio 3.4.0 expects the versionCode to be positive. Otherwise the build fails.

A problem occurred configuring project ':app'.
> Failed to notify project evaluation listener.
   > android.defaultConfig.versionCode is set to 0, but it should be a positive integer.
     See https://developer.android.com/studio/publish/versioning#appversioning for more information.
This happens with `git clone X --depth=n` often used on CI
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants