Closed Intimaria closed 6 years ago
Hi again, and thanks for this Pull Request.
If you don't mind, we should have fewer commits in this Pull Request. See this link for which commits are currently included in the PR: https://github.com/RefugeRestrooms/refugerestrooms/pull/422/commits, or what changes are included: https://github.com/RefugeRestrooms/refugerestrooms/pull/422/files
The easy way to have fewer commits is to clone refuge into a new folder:
git clone https://github.com/refugerestrooms/refugerestrooms [new-refuge-folder-name-here]
And do the commits for this PR in the new folder.
A more-complicated way to have fewer commits in this PR:
From the folder you have been working in, we need to set up a clean develop branch that matches the upstream develop branch.
git checkout develop
develop
branch)git branch working-branch
develop
over to a branch called working-branch
.) working-branch
, so you are still on develop
.)Make an entry in the list of "remotes" so we can get the latest updates of github.com/refugerestrooms/refugerestrooms
git remote add upstream https://github.com/refugerestrooms/refugerestrooms
git fetch upstream
upstream
.)git reset --hard upstream/develop
develop
from upstream)Then branch off of develop
again to keep develop
easily sync-able:
git branch new-feature
&& git checkout new-feature
. . . or the equivalent:
git checkout -b new-feature
And now the new-feature
branch can be used to finish the required work for this PR.
In any case, to push whatever local branch you're working on to this PR, and overwrite what's here now, you can do:
git push -f https://github.com/Intimaria/refugerestrooms feature/lang_folders
Hi @DeeDeeG I think I did it.
Okay, this looks good!
I would be happy to merge this. Just to be sure, are there any second opinions, @mi-wood, @tkwidmer?
This looks good to me.
Context
Summary of Changes
Checklist
Screenshots
Before
After