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

[TASK] Add ddev directory to gitignore #1133

Merged
merged 1 commit into from
Mar 24, 2024
Merged

[TASK] Add ddev directory to gitignore #1133

merged 1 commit into from
Mar 24, 2024

Conversation

linawolf
Copy link
Member

Most recent versions of ddev seem to not create their own gitignore anymore

releases: main, 12.4, 11.5

Most recent versions of ddev seem to not create their own gitignore anymore

releases: main, 12.4, 11.5
Copy link
Contributor

@garvinhicking garvinhicking left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Odd, mine still does. But I think its ok to add it anyways ;)

@linawolf linawolf merged commit 8edd2cb into main Mar 24, 2024
2 checks passed
@linawolf linawolf deleted the task/gitignore branch March 24, 2024 14:29
Copy link
Contributor

The backport to 11.5 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 70a5acef... [TASK] Add ddev directory to gitignore
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".

stdout
Auto-merging .gitignore
CONFLICT (content): Merge conflict in .gitignore

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-11.5 11.5
# Navigate to the new working tree
cd .worktrees/backport-11.5
# Create a new branch
git switch --create backport-1133-to-11.5
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 70a5acef6a4df9f408e2aa3c7d3aee4645df6bb8
# Push it to GitHub
git push --set-upstream origin backport-1133-to-11.5
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-11.5

Then, create a pull request where the base branch is 11.5 and the compare/head branch is backport-1133-to-11.5.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants