Editing
Mediabistro Git Configuration
(section)
Jump to navigation
Jump to search
Warning:
You are not logged in. Your IP address will be publicly visible if you make any edits. If you
log in
or
create an account
, your edits will be attributed to your username, along with other benefits.
Anti-spam check. Do
not
fill this in!
== Syncing a sandbox repo with the work of others == Scenario: * I start working in my sandbox/repo using my own branch. * Someone else works on the same set of files in their sandbox/repo. * Now I need to make additional edits. * The goal is to make sure that my edits don't overwrite the other work done in any other sandboxes. * This assumes that once they were done with their work they pushed it out to `master`. <syntaxhighlight lang="bash"> $ git co <mybranch> $ git fetch $ git rebase remotes/origin/master </syntaxhighlight> More information on `git rebase`: [http://git-scm.com/book/en/Git-Branching-Rebasing|Git Documentation: 3.6 Git Branching - Rebasing]
Summary:
Please note that all contributions to Littledamien Wiki may be edited, altered, or removed by other contributors. If you do not want your writing to be edited mercilessly, then do not submit it here.
You are also promising us that you wrote this yourself, or copied it from a public domain or similar free resource (see
Littledamien Wiki:Copyrights
for details).
Do not submit copyrighted work without permission!
Cancel
Editing help
(opens in new window)
Navigation menu
Personal tools
Not logged in
Talk
Contributions
Create account
Log in
Namespaces
Page
Discussion
English
Views
Read
Edit
View history
More
Search
Navigation
Main page
Recent changes
Random page
Help about MediaWiki
Tools
What links here
Related changes
Special pages
Page information