To commit all modified files into the local copy of your repo, do " to include in what will be committed) # INSTALL no changes added to commit ( use "git add" and / or "git commit -a" )Ĭheck what the actual changes are with git diff ( git diff).Īdd any new files to version control git add new_file_name (see " to discard changes in working directory) # modified: README # Untracked files: # (use "git add. " to update what will be committed) # (use "git checkout. # On branch ny-new-feature # Changed but not updated: # (use "git add. Update the mirror of trunk #įirst make sure you have done Linking your repository to the upstream repo.įrom time to time you should fetch the upstream (trunk) changes from github: ![]() See deleting master on github forĭetails (replacing master with main). It may sound strange, but deleting your own main branch can help reduceĬonfusion about which branch you are on. See linux git workflow and ipython git workflow for some explanation. This in turn makes it easier for project maintainers (that might be you) to see This way of working helps to keep work well organized, with readable history. If you do find yourself merging from trunk, consider Rebasing on trunkĪsk on the scikit-image developer forum if you get stuck. Your feature branch while you are working. If you can possibly avoid it, avoid merging trunk or any other branches into Name your branch for the purpose of the changes - e.g.īugfix-for-issue-14 or refactor-database-code. Make a new branch for each separable set of changes - “one task, one When you are starting a new set of changes, fetch any changes from trunk,Īnd start a new feature branch from that. In what follows we’ll refer to the upstream scikit-image main branch, asĭon’t use your main branch for anything. You already have your own forked copy of the scikit-image repository, byįollowing Making your own copy (fork) of scikit-image.
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |