Changes between Version 45 and Version 46 of CollaborateOnGithub
- Timestamp:
- Aug 14, 2011, 10:25:47 PM (13 years ago)
Legend:
- Unmodified
- Added
- Removed
- Modified
-
CollaborateOnGithub
v45 v46 38 38 (From http://cheat.errtheblog.com/s/git) 39 39 40 Tell `git branch` and `git checkout` to setup new branches so that `git pull` will [http://www.diamondlinks.net/ link building]appropriately merge from that remote branch. Without this, you will have to add `--track` to your branch command or manually merge remote tracking branches with `fetch` and then `merge`40 Tell `git branch` and `git checkout` to setup new branches so that `git pull` will appropriately merge from that remote branch. Without this, you will have to add `--track` to your branch command or manually merge remote tracking branches with `fetch` and then `merge` 41 41 {{{ 42 42 git config branch.autosetupmerge true … … 81 81 === Working on a task === 82 82 83 '''Goal''': keep the changes self-contained, create and update patches suitable for [http://www.truckaccidentlawyersource.com/ truck accident lawyer]attaching to [http://code.djangoproject.com/simpleticket tickets in Django trac].83 '''Goal''': keep the changes self-contained, create and update patches suitable for attaching to [http://code.djangoproject.com/simpleticket tickets in Django trac]. 84 84 85 85 1. Create a branch from master … … 189 189 should alleviate the problem and `git push` should work again. 190 190 191 Generally, `non-fast forward` means that the local history differs from the [http://www.mycaal.com/ loan modification]remote history and pushing would change remote history.191 Generally, `non-fast forward` means that the local history differs from the remote history and pushing would change remote history. 192 192 Although rewriting history may wreak havoc if someone has forked your repository after the changed point, it is sometimes necessary. 193 193