Skip to content

GitLab

  • Menu
Projects Groups Snippets
    • Loading...
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
  • Sign in
  • C chouette-core-tmp
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
  • Issues 0
    • Issues 0
    • List
    • Boards
    • Service Desk
    • Milestones
  • Merge requests 0
    • Merge requests 0
  • CI/CD
    • CI/CD
    • Pipelines
    • Jobs
    • Schedules
  • Deployments
    • Deployments
    • Environments
    • Releases
  • Monitor
    • Monitor
    • Incidents
  • Packages & Registries
    • Packages & Registries
    • Infrastructure Registry
  • Analytics
    • Analytics
    • CI/CD
    • Repository
    • Value Stream
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Collapse sidebar
  • Administrator
  • chouette-core-tmp
  • Wiki
  • Home

Home · Changes

Page history
Home: Use `git push --force-with-lease` instead of `--force` authored Apr 03, 2018 by Teddy Wing's avatar Teddy Wing
The `--force-with-lease` flag is safer than `--force`, so it should be
recommended first.
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
+1 -1
  • Home.md Home.md +1 -1
  • No files found.
Home.md
View page @ 5072a4ed
...@@ -28,7 +28,7 @@ To update a remote feature branch: ...@@ -28,7 +28,7 @@ To update a remote feature branch:
```sh ```sh
# Cleaner method. Try this first. # Cleaner method. Try this first.
git rebase master git rebase master
git push -f origin my_branch git push --force-with-lease origin my_branch
# Simpler method when dealing with a complex merge. # Simpler method when dealing with a complex merge.
git merge master git merge master
......
Clone repository
  • Class Diagram
  • Data Models
  • Home
  • Optional Features
  • Rails Controller
  • Rails I18n
  • Rails migrations
  • Rails models
  • Rails spec
  • Rails views
  • Seed database