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.

Sign up for GitHub

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

Jump to bottom

Some fix on creating new branch #2796

Merged
merged 1 commit into from
Aug 4, 2017
Merged

Some fix on creating new branch #2796

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -992,11 +992,11 @@ transifex-init: .build/python-venv/bin/tx \
.build/locale/ngeo.pot \
.build/locale/gmf.pot \
.build/locale/apps.pot
.build/python-venv/bin/tx push --source --force
.build/python-venv/bin/tx push --source --force --no-interactive
.build/python-venv/bin/tx push --translations --force --no-interactive

cd contribs/gmf/apps/
.build/python-venv/bin/tx push --source --force
.build/python-venv/bin/tx push --source --force --no-interactive
.build/python-venv/bin/tx push --translations --force --no-interactive
cd -

Expand Down
6 changes: 3 additions & 3 deletions docs/developer-guide.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@ git pull origin master

Create the new branch:
```bash
git checkout -b x_y
git checkout -b x.y
```

Update the `.travis.yml`:
Expand All @@ -305,7 +305,7 @@ Commit and push the changes:
```bash
git add .travis.yml
git commit -m "Update the branch"
git push origin x_y
git push origin x.y
```

Back on master:
Expand All @@ -315,7 +315,7 @@ git checkout master

Do the merge to prepare the future merges:
```bash
git checkout merge x.y
git merge x.y
```

Restore the `.travis.yml`:
Expand Down