Changes between Version 45 and Version 46 of CollaborateOnGithub


Ignore:
Timestamp:
08/14/11 22:25:47 (4 years ago)
Author:
anonymous
Comment:

DELETING SPAM. WHY DON'T YOU HAVE A CAPTCHA????????

Legend:

Unmodified
Added
Removed
Modified
  • CollaborateOnGithub

    v45 v46  
    3838(From http://cheat.errtheblog.com/s/git)
    3939
    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`
     40Tell `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`
    4141{{{
    4242git config branch.autosetupmerge true
     
    8181=== Working on a task ===
    8282
    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].
    8484
    8585 1. Create a branch from master
     
    189189should alleviate the problem and `git push` should work again.
    190190
    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.
     191Generally, `non-fast forward` means that the local history differs from the remote history and pushing would change remote history.
    192192Although rewriting history may wreak havoc if someone has forked your repository after the changed point, it is sometimes necessary.
    193193
Back to Top