667
edits
Changes
no edit summary
*** Conflict markers <code><<<<<<<<<</code>, <code>=============</code>, <code>>>>>>>>>>>>></code>
** [https://blog.humphd.org/fearless-merges/ Doing big merges in git]
== Week 6 ==
* Hacktoberfest Updates
** Add any interesting projects you find/work on to [https://github.com/humphd/hacktoberfest-at-seneca-2018/wiki/Interesting-Open-Source-Projects this list on the wiki]
** Update your Info on the [https://github.com/humphd/hacktoberfest-at-seneca-2018/wiki/Student-Submissions submissions wiki page] by Monday:
*** Add your Name beside your GitHub username
*** New Pull Request
*** New Blog Post
*** Any Issues you're working on
** [https://github.com/humphd/hacktoberfest-at-seneca-2018/blob/master/data/week01.md Week 1 Summary]
* <code>git rebase branch</code>
** Replay commits on a new base branch/commit
** Process goes like this:
*** git finds a common ancestor commit of the branch you're on, and the one you're rebasing onto
*** git calculates DIFFs for each, saves them to disk
*** git checks out the commit you want to branch onto, and begins to replay those diffs one by one
*** if there is a merge conflict, the rebase pauses so you can fix things
*** use <code>git rebase --continue</code> or <code>git rebase --abort</code> to move forward after such a pause
** Never rebase commits that are shared publicly in another repo. Only do it on commits you own locally (e.g., a topic branch you are working on)
** Don't use rebase to get rid of commits in a public branch, use <code>git revert commit-sha</code> instead to apply an inverse commit
** If you rebase a branch you've pushed (e.g., for a pull request), when you push, use <code>git push origin branch-name -f</code> (f means force and will overwrite)
** <code>git rebase -i</code> for interactive rebase
*** shows a script of all commits in reverse order (order they will be replayed). You can hand edit this to remove, re-order, or combine commits
** You can squash on the same branch by rebasing on <code>HEAD~n</code> where n is how many commits back from HEAD to go
* PRs needing a Rebase
** https://github.com/filerjs/filer/pull/496
** https://github.com/filerjs/filer/pull/437
** https://github.com/filerjs/filer/pull/439
** https://github.com/filerjs/filer/pull/468
** https://github.com/filerjs/filer/pull/545
