Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/use git info cache for all solution projects #191

Merged
merged 6 commits into from
Nov 18, 2022
Merged

Feature/use git info cache for all solution projects #191

merged 6 commits into from
Nov 18, 2022

Conversation

tisis2
Copy link
Contributor

@tisis2 tisis2 commented Mar 31, 2022

closes #190

use $(GitCachePath) to overwrite the cache location. the GitIsDirty.cache should now be overwritten.

@tisis2 tisis2 changed the title #190: Feature/use git info cache for all solution projects Feature/use git info cache for all solution projects Mar 31, 2022
…AllSolutionProjects

# Conflicts:
#	src/GitInfo/build/GitInfo.targets
@CLAassistant
Copy link

CLAassistant commented Aug 18, 2022

CLA assistant check
All committers have signed the CLA.

@kzu
Copy link
Member

kzu commented Oct 18, 2022

Ok, should be ready to merge as soon as the CLA is signed and conflicts resolved. Sorry for the delay!

@kzu kzu enabled auto-merge (rebase) October 18, 2022 19:08
…AllSolutionProjects

# Conflicts:
#	src/GitInfo/build/GitInfo.targets
auto-merge was automatically disabled October 21, 2022 06:48

Head branch was pushed to by a user without write access

@tisis2
Copy link
Contributor Author

tisis2 commented Oct 21, 2022

resolved conflicts and signed cla. so just waiting for the merge

@kzu kzu enabled auto-merge (rebase) November 16, 2022 06:41
@kzu kzu disabled auto-merge November 16, 2022 06:42
@kzu
Copy link
Member

kzu commented Nov 16, 2022

ok, for whatever reason, it's not allowing me to rebase your branch, so you'll have to do it again I'm afraid :(

@kzu kzu enabled auto-merge (rebase) November 16, 2022 06:46
auto-merge was automatically disabled November 16, 2022 06:47

Rebase failed

@kzu
Copy link
Member

kzu commented Nov 16, 2022

Dang, merged more PRs and now it's again out of sync :(. Sorry! Next release is yours alone 😉

@kzu kzu enabled auto-merge (rebase) November 18, 2022 05:41
auto-merge was automatically disabled November 18, 2022 05:42

Rebase failed

@kzu kzu merged commit 51098e6 into devlooped:main Nov 18, 2022
@devlooped devlooped locked and limited conversation to collaborators Sep 11, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
4 participants